diff --git a/.drone.yml b/.drone.yml
index 022c095..790f402 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,8 +3,8 @@ kind: pipeline
 type: docker
 name: default
 
-#environment:
-# DOCKER_REPO: glenux/service-ntfy
+environment:
+  DOCKER_REPO: glenux/service-ntfy
 
 steps:
   - name: publish:commit_sha
@@ -18,8 +18,8 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-ntfy:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-ntfy
+      cache_from: "${DOCKER_REPO}:latest_${DRONE_BRANCH/\\//-}"
+      repo: "${DOCKER_REPO}"
       tags: "${DRONE_COMMIT_SHA:0:8}"
 
   - name: publish:commit_branch
@@ -32,8 +32,8 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-ntfy:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-ntfy
+      cache_from: "${DOCKER_REPO}:latest_${DRONE_BRANCH/\\//-}"
+      repo: "${DOCKER_REPO}"
       tags: "latest_${DRONE_BRANCH/\\//-}"
     when:
       branch:
@@ -41,16 +41,17 @@ steps:
         - "develop"
         - "feature/*"
 
-      # - name: docker
-      #   image: plugins/docker
-      #   settings:
-      #     username: "${DOCKERHUB_USERNAME}"
-      #     password: "${DOCKERHUB_PASSWORD}"
-      #     repo: glenux/service-ntfy
-      #     tags: latest
-      #   when:
-      #     branch:
-      # - master
+  - name: docker
+    image: plugins/docker
+    settings:
+      username: "${DOCKERHUB_USERNAME}"
+      password: "${DOCKERHUB_PASSWORD}"
+      cache_from: "${DOCKER_REPO}:latest_${DRONE_BRANCH/\\//-}"
+      repo: "${DOCKER_REPO}"
+      tags: latest
+    when:
+      branch:
+        - master
 
 # volumes:
 #   - name: cache