diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d8c2e9d5..904959fd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,29 +3,19 @@ variables:
   DOCKER_DRIVER: overlay
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
-  MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
   # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
   # when running from the command line.
-  # `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
+  # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
 
 stages:
   - build
   - deploy
 
-before_script:
-  - mkdir -pv /home/docker
-  - echo $DOCKER_CA_PEM >> /home/docker/ca.pem.base64
-  - echo $DOCKER_CERT >> /home/docker/cert.pem.base64
-  - echo $DOCKER_KEY >> /home/docker/key.pem.base64
-  - base64 -d /home/docker/ca.pem.base64 >> /home/docker/ca.pem
-  - base64 -d /home/docker/cert.pem.base64 >> /home/docker/cert.pem
-  - base64 -d /home/docker/key.pem.base64 >> /home/docker/key.pem
-  - alias secure-docker="docker -H tcp://glados.minidigger.me:4243 --tlsverify --tlscacert=/home/docker/ca.pem --tlscert=/home/docker/cert.pem --tlskey=/home/docker/key.pem"
-
 cache:
   paths:
-    - ~/.m2/repository/
+    - .m2/repository/
     - src/main/frontend/node
     - src/main/frontend/node_modules
     - target/
@@ -42,10 +32,21 @@ build:
 deploy:
   stage: deploy
   image: docker:latest
-  services:
-    - docker:dind
   variables:
     SERVICE_NAME: hangarnew
+  services:
+    - docker:dind
+  dependencies:
+    - build:build
+  before_script:
+    - mkdir -pv /home/docker
+    - echo $DOCKER_CA_PEM >> /home/docker/ca.pem.base64
+    - echo $DOCKER_CERT >> /home/docker/cert.pem.base64
+    - echo $DOCKER_KEY >> /home/docker/key.pem.base64
+    - base64 -d /home/docker/ca.pem.base64 >> /home/docker/ca.pem
+    - base64 -d /home/docker/cert.pem.base64 >> /home/docker/cert.pem
+    - base64 -d /home/docker/key.pem.base64 >> /home/docker/key.pem
+    - alias secure-docker="docker -H tcp://glados.minidigger.me:4243 --tlsverify --tlscacert=/home/docker/ca.pem --tlscert=/home/docker/cert.pem --tlskey=/home/docker/key.pem"
   script:
       - apk add --no-cache docker-compose
       - cd docker
diff --git a/docker/hangar/application.yml b/docker/hangar/application.yml
index 947f9406a..624b89a31 100644
--- a/docker/hangar/application.yml
+++ b/docker/hangar/application.yml
@@ -1,4 +1,5 @@
 spring:
+  datasource:
     url: jdbc:postgresql://db:5432/hangar
     username: hangar
     password: hangar