diff --git a/.drone.yml b/.drone.yml
index 7679416686ffe21ff5fc2f7457d1edbf86c7412e..f72c699fa617023055df6c36e4da4e59a240f3ae 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,7 +2,7 @@ kind: pipeline
 name: default
 
 steps:
-  - name: build
+  - name: Test
     image: python:3.9
     environment:
       POSTGRES_HOST: database
@@ -26,3 +26,28 @@ trigger:
   event:
     - push
     - pull_request
+
+--- 
+kind: pipeline 
+name: docker
+
+steps:
+  - name: docker
+    image: plugins/docker
+    pull: if-not-exists
+    settings:
+      repo: jghnordunet/opennsa
+      squash: true
+      auto_tag: true
+      dockerfile: docker/Dockerfile
+      username:
+        from_secret: DOCKER_USER
+      password:
+        from_secret: DOCKER_PASS
+
+trigger:
+  branch:
+    - master
+  event:
+    - tag
+    - push
diff --git a/docker-compose.override.yml_placeholder b/docker-compose.override.yml_placeholder
index 7dea08cee614167e98fdcc7bf21c5afe2ef97052..53d250c6af2d52b7d1f44617d8050303d6b01072 100644
--- a/docker-compose.override.yml_placeholder
+++ b/docker-compose.override.yml_placeholder
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   opennsa:
-    image: opennsa:latest
+    image: jghnordunet/opennsa:latest
     command: Any valid command
     ## Mount entire project to volume avoids constant rebuilds.
     ## You may need to load the container as:
diff --git a/docker-compose.yml b/docker-compose.yml
index b370e4a475564b3beaeb2cb9d28c3ddc52f47d35..201420daf2f7e9aa70c7a6277c9d497c226f8c6b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - opennsa-pgdata:/var/lib/postgresql/data
     env_file: .env
   opennsa:
-    image: opennsa:latest
+    image: jghnordunet/opennsa:latest
     build:
       context: .
       dockerfile: docker/Dockerfile