diff --git a/.drone1.yml b/.drone1.yml
index 70b72d1b9e3..8fb4c276503 100644
--- a/.drone1.yml
+++ b/.drone1.yml
@@ -160,6 +160,7 @@ steps:
       - export PATH=$PATH:$GOPATH/bin
       - make generate
       - make release-dirs
+    depends_on: [ fetch-tags ]
 
   - name: static-build-windows
     image: techknowlogick/xgo:latest
@@ -302,6 +303,7 @@ steps:
         from_secret: docker_password
       repo: vikunja/api
       auto_tag: true
+    depends_on: [ fetch-tags ]
 
   - name: telegram
     image: appleboy/drone-telegram
@@ -351,6 +353,7 @@ steps:
     commands:
       - make generate
       - make release-dirs
+    depends_on: [ fetch-tags ]
 
   - name: static-build-windows
     image: techknowlogick/xgo:latest
@@ -493,6 +496,7 @@ steps:
         from_secret: docker_password
       repo: vikunja/api
       auto_tag: true
+    depends_on: [ fetch-tags ]
 
   - name: telegram
     image: appleboy/drone-telegram
diff --git a/Dockerfile b/Dockerfile
index fdf40f0d482..55f72a66f74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 
 ##############
 # Build stage
-FROM golang:1.11-alpine AS build-env
+FROM golang:1-alpine AS build-env
 
 ARG VIKUNJA_VERSION
 ENV TAGS "sqlite"