diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 8ba7711..3795cb9 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Create Cache Key
         id: cache-key
         run: |
-          echo "::set-output name=key::$(/bin/date -u "+%Y%U")"
+          echo "::set-output name=key::$(/bin/date -u "+%Y%U-2")"
         shell: bash
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -57,3 +57,6 @@ jobs:
         with:
           name: artifacts
           path: target/
+      # Make room for the docker layer caching to package up layers
+      - name: Cleanup
+        run: rm -fr *
diff --git a/Dockerfile b/Dockerfile
index 0311ba1..3b35ae9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,10 +22,11 @@ RUN curl https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-
 ENV PATH=/home/build/apache-maven-3.6.3/bin:$PATH
 
 # Prepare a snapshot of Netty 5
-RUN git clone -b master https://github.com/netty/netty.git netty
-WORKDIR /home/build/netty
-RUN mvn install -DskipTests -T1C -B -am
-WORKDIR /home/build
+RUN git clone --depth 1 -b master https://github.com/netty/netty.git netty \
+    && cd netty \
+    && mvn install -DskipTests -T1C -B -am \
+    && cd .. \
+    && rm -fr netty
 
 # Prepare our own build
 COPY pom.xml pom.xml
diff --git a/Makefile b/Makefile
index 4fa84ec..905ad57 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: image test dbg clean build
+.PHONY: image test dbg clean build rebuild
 .DEFAULT_GOAL := build
 
 image: