diff --git a/.gitlab-ci.coko.yml b/.gitlab-ci.coko.yml
index d3b54c0bf373a44199a2efcd95f9dba5ee0da379..f8689c2fedbce146070e783e3982e67099498887 100644
--- a/.gitlab-ci.coko.yml
+++ b/.gitlab-ci.coko.yml
@@ -23,7 +23,7 @@ build:
     - |
       if [ -z "$DOCKERHUB_USERNAME" ] || [ -z "$DOCKERHUB_PASSWORD" ]; then echo "Not pushing" && exit 0; fi
       docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-      docker build --file ./Dockerfile-ci --cache-from $IMAGE_ORG/$IMAGE_NAME:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .   
+      docker build --build-arg instance_name=coko --file ./Dockerfile-ci --cache-from $IMAGE_ORG/$IMAGE_NAME:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .   
       docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
       docker push $IMAGE_ORG/$IMAGE_NAME:latest
 
diff --git a/.gitlab-ci.elife.yml b/.gitlab-ci.elife.yml
index 5398fc4970e6d81f450c86e63b9626d18031feb4..842ff1d2a7898653c3072e18297e7c2948d969f9 100644
--- a/.gitlab-ci.elife.yml
+++ b/.gitlab-ci.elife.yml
@@ -23,6 +23,7 @@ build:
       docker login -u $DOCKERHUB_USERNAME_ELIFE -p $DOCKERHUB_PASSWORD_ELIFE
       docker pull $IMAGE_ORG/$IMAGE_NAME:latest || true
       docker build \
+      --build-arg instance_name=elife \
       --file ./Dockerfile-production \
       --cache-from $CI_REGISTRY_IMAGE:latest \
       --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA \
diff --git a/Dockerfile-ci b/Dockerfile-ci
index 4be083a1764462420697f3e6c0cb373f9392e686..36f886bb5eb3a46d8b1e2658af62d00cbe900951 100644
--- a/Dockerfile-ci
+++ b/Dockerfile-ci
@@ -1,5 +1,7 @@
 FROM cypress/browsers:node14.16.0-chrome89-ff86
 
+ARG instance_name
+
 ENV NODE_ENV "development"
 ENV SERVER_PROTOCOL "http"
 ENV SERVER_HOST "0.0.0.0"
@@ -7,7 +9,7 @@ ENV SERVER_PORT "3000"
 ENV CLIENT_PROTOCOL "http"
 ENV CLIENT_HOST "0.0.0.0"
 ENV CLIENT_PORT "4000"
-ENV INSTANCE_NAME "coko"
+ENV INSTANCE_NAME $instance_name
 ENV HOME "/home/simplej"
 
 RUN mkdir -p ${HOME}
diff --git a/Dockerfile-production b/Dockerfile-production
index 361ce271f92b02ef2b22429553b901b82da166c4..1e9a840db0efa76d0c73b61f315b174e017d2415 100644
--- a/Dockerfile-production
+++ b/Dockerfile-production
@@ -18,7 +18,9 @@ RUN yarn install --frozen-lockfile --production=false
 
 COPY . .
 
-ENV INSTANCE_NAME "elife"
+ARG instance_name
+
+ENV INSTANCE_NAME $instance_name
 ENV NODE_ENV "production"
 ENV SERVER_PROTOCOL "http"
 ENV SERVER_HOST "localhost"