diff --git a/.drone.yml b/.drone.yml
index 2ea2c9a..d0417ca 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,6 +13,10 @@ trigger:
   branch:
     include:
       - feature/*
+  event:
+    include:
+      - push
+      - custom
 
 clone:
   disable: true
@@ -36,11 +40,6 @@ steps:
       - docker-compose down
       - docker-compose up -d --build --force-recreate
       - docker image prune -f
-  when:
-    event:
-      include:
-        - push
-        - custom
 
 ---
 
@@ -56,6 +55,9 @@ trigger:
   branch:
     include:
       - develop
+  event:
+    include:
+      - push
 
 clone:
   disable: true
@@ -79,10 +81,6 @@ steps:
       - docker-compose down
       - docker-compose up -d --build --force-recreate
       - docker image prune -f
-  when:
-    event:
-      include:
-        - push
 
 
 ---
@@ -161,7 +159,7 @@ steps:
   image: plugins/docker
   settings:
     registry:
-      from_secret: Œ
+      from_secret: docker_registry
     username:
       from_secret: docker_username
     password: