diff --git a/.drone.yml b/.drone.yml
index a4b291c..cc9aee9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,6 +9,8 @@ steps:
 - name: build-main
   image: plugins/docker
   settings:
+    cache_from:
+      - "dutchellie/pepebot:latest"
     username: 
       from_secret: docker_username
     password:
@@ -20,6 +22,8 @@ steps:
 - name: build-service
   image: plugins/docker
   settings:
+    cache_from:
+      - "dutchellie/pepebot_service:latest"
     username: 
       from_secret: docker_username
     password:
@@ -42,6 +46,8 @@ steps:
 - name: build-main
   image: plugins/docker
   settings:
+    cache_from:
+      - "dutchellie/pepebot:latest"
     username: 
       from_secret: docker_username
     password:
@@ -53,6 +59,8 @@ steps:
 - name: build-service
   image: plugins/docker
   settings:
+    cache_from:
+      - "dutchellie/pepebot_service:latest"
     username: 
       from_secret: docker_username
     password:
diff --git a/Dockerfile b/Dockerfile
index 1c36771..bec2a1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.16.4 AS builder
+FROM golang:1.16.4-alpine AS builder
 WORKDIR /go/src/quenten.nl/pepebot/
   
 COPY . ./
diff --git a/pepeservice/Dockerfile b/pepeservice/Dockerfile
index 2634756..952f740 100644
--- a/pepeservice/Dockerfile
+++ b/pepeservice/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.17 AS builder
+FROM golang:1.17-alpine AS builder
 WORKDIR /go/src/quenten.nl/pepeservice
 
 COPY . ./