diff --git a/Containerfile b/Containerfile
index a349267..d780d5a 100644
--- a/Containerfile
+++ b/Containerfile
@@ -6,18 +6,20 @@ LABEL com.github.containers.toolbox="true" \
     maintainer="Joe Ipson" \
     title="Jetskis"
 
-# Add PPAs
-RUN add-apt-repository ppa:longsleep/golang-backports -y
-
 # Update apt
 RUN apt-get update && apt-get dist-upgrade -y && apt-get upgrade -y
 
+# Install prerequisite pacakges
+RUN apt-get install software-properties-common apt-transport-https apt-utils -y
+
+# Add PPAs
+RUN add-apt-repository ppa:longsleep/golang-backports -y
+
 # Install base packages
-RUN apt-get install micro mosh tmux apt-transport-https \
-    htop awscli ffmpeg git zsh software-properties-common \
-    apt-utils dialog golang-go golang-easyjson btop \
-    unzip p7zip-full p7zip-rar nano wget gpg curl \
-    -y
+RUN apt-get install micro mosh tmux curl \
+    htop awscli ffmpeg git zsh nano wget \
+    dialog golang-go golang-easyjson btop \
+    unzip p7zip-full p7zip-rar gpg -y
 
 # Install dev packages
 RUN apt-get install build-essential libssl-dev zlib1g-dev \