diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 848aa815c9a4cfc59e4274dbe233662431d58600..e63b5a282e6151986275c5e9878493acfabb213b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,13 @@ stages:
 
 variables:
   REGISTRY: registry.sc07.dev
-  IMAGE_NAME: $GITLAB_USER_LOGIN/$CI_PROJECT_NAME:edge
+  IMAGE_NAME: sc07/canvas:edge
 
 publish:
   image: docker
   stage: publish
+  tags:
+    - docker-in-docker
   services:
     - docker:dind
   before_script:
@@ -23,10 +25,29 @@ deploy:
   only:
     - main
   before_script:
-    - apt-get -yq update
-    - apt-get -yqq install ssh
-    - install -m 600 -D /dev/null ~/.ssh/id_rsa
-    - echo "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
+    ##
+    ## Install ssh-agent if not already installed, it is required by Docker.
+    ## (change apt-get to yum if you use an RPM-based image)
+    ##
+    - "command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )"
+
+    ##
+    ## Run ssh-agent (inside the build environment)
+    ##
+    - eval $(ssh-agent -s)
+
+    ##
+    ## Give the right permissions, otherwise ssh-add will refuse to add files
+    ## Add the SSH key stored in SSH_PRIVATE_KEY file type CI/CD variable to the agent store
+    ##
+    - chmod 400 "$SSH_PRIVATE_KEY"
+    - ssh-add "$SSH_PRIVATE_KEY"
+
+    ##
+    ## Create the SSH directory and give it the right permissions
+    ##
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
     - ssh-keyscan -H $SSH_HOST > ~/.ssh/known_hosts
   script:
     - ssh $SSH_USER@$SSH_HOST "cd $WORK_DIR && docker compose pull && docker compose up -d && exit"