diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba1ff7822ca957c39f7fe35d2425ecf964a4081e..fda6e42d83334988e99cc5cbe8ad136c7d332a6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 variables:
   IMAGE_TAG: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}
+  IMAGE_TAG_DEV: ${IMAGE_TAG}-dev
   GRP_CURRENT_SERVICE: $GCP_SERVICE-${CI_COMMIT_REF_SLUG}
   GCR_IMAGE: $GCR_SERVER/$GCP_ID/$GRP_CURRENT_SERVICE
 
@@ -115,14 +116,19 @@ build:jar:
   environment:
     name: $CI_COMMIT_REF_SLUG
 
-build:docker:
+.base:docker: &baseDocker
   image: docker:latest
   stage: build
+  services:
+    - docker:dind
+  needs:
+    - build:jar
+
+build:docker:
+  <<: *baseDocker
   needs:
     - build:jar
     - build:getDomainName
-  services:
-    - docker:dind
   script:
     - echo $GCP_KEY_PROD >> service-account-file.json
     - apk add zip
@@ -136,6 +142,23 @@ build:docker:
     - docker build -t ${IMAGE_TAG} .
     - docker push ${IMAGE_TAG}
 
+build:docker-dev:
+  <<: *baseDocker
+  script:
+    - apk add zip
+    - mkdir -p BOOT-INF/classes
+    - echo "oauth.providers=" >> BOOT-INF/classes/oauthKeys.properties
+    - zip target/*-spring-boot.jar BOOT-INF/classes/oauthKeys.properties
+    - export DOMAIN=$(cat domain.txt)
+    - touch BOOT-INF/classes/server.properties
+    - zip target/*-spring-boot.jar BOOT-INF/classes/server.properties
+    - echo "datastore.emulated=true" >> BOOT-INF/classes/datastore.properties
+    - echo "datastore.emulated.GUI=false" >> BOOT-INF/classes/datastore.properties
+    - zip target/*-spring-boot.jar BOOT-INF/classes/datastore.properties
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
+    - docker build -t ${IMAGE_TAG_DEV} -f Dockerfile-dev .
+    - docker push ${IMAGE_TAG_DEV}
+
 .base:deploy: &baseDeploy
   <<: *baseGCP
   stage: deploy
diff --git a/Dockerfile-dev b/Dockerfile-dev
new file mode 100644
index 0000000000000000000000000000000000000000..fa3bc82b46f34af3e6634ab91525bd1955384cb5
--- /dev/null
+++ b/Dockerfile-dev
@@ -0,0 +1,5 @@
+FROM google/cloud-sdk
+RUN apt-get install openjdk-11-jdk
+ARG JAR_FILE=target/*-spring-boot.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file