diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
index 21109e6..7e08539 100644
--- a/dockerfiles/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -48,8 +48,9 @@ RUN sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb
 
 # Select options
 ARG ROBOTOLOGY_SUPERBUILD_RELEASE
-ARG BUILD_TYPE
+ARG BUILD_TYPE=Release
 ARG ROBOTOLOGY_SUPERBUILD_INSTALL_DIR=/usr/local
+ARG FORK=mfussi66/icub-main
 
 # Set up git (required by superbuild)
 RUN git config --global user.name "GitHub Actions" && \
@@ -68,7 +69,7 @@ RUN git clone https://github.com/robotology/robotology-superbuild.git --depth 1
 
 # Download and build fork of icub-main
 RUN cd /robotology-superbuild/src/ICUB && \
-    git remote add fork https://github.com/mfussi66/icub-main.git && \
+    git remote add fork https://github.com/${FORK}.git && \
     git fetch fork && \
     git checkout -b fork-master --track fork/master && \
     cd /robotology-superbuild/build/ && \
diff --git a/dockerfiles/README.md b/dockerfiles/README.md
index 4234c4d..76e76f2 100644
--- a/dockerfiles/README.md
+++ b/dockerfiles/README.md
@@ -6,9 +6,7 @@ Make sure you have [Docker](https://docs.docker.com/get-docker) available on you
 1. Build the docker image:
    ```console
    cd dockerfiles
-   docker build . --build-arg ROBOTOLOGY_SUPERBUILD_RELEASE=releases/2021.05 \
-                  --build-arg BUILD_TYPE=Release \
-                  --tag icub-fkin-inspection
+   docker build . --build-arg ROBOTOLOGY_SUPERBUILD_RELEASE=releases/2021.05 --tag icub-fkin-inspection
    ```
 2. Launch the container:
     ```console