diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6a8df2db..034c571c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -222,15 +222,12 @@ jobs:
       - run:
           name: Install extra snaps without snapd
           command: |
-            mkdir ~/tmp && cd ~/tmp
-            # snap install go
-            snap download go
-            mkdir -p /snap/go && unsquashfs -d /snap/go/current go_*.snap
-            rm ~/tmp/*
-            # snap install gnome-3-34-1804-sdk
-            snap download gnome-3-34-1804-sdk
-            mkdir -p /snap/gnome-3-34-1804-sdk && unsquashfs -d /snap/gnome-3-34-1804-sdk/current gnome-3-34-1804-sdk_*.snap
-            rm ~/tmp/*
+            mkdir ~/tmp
+            install_snap() { cd ~/tmp && snap download $1 && mkdir -p /snap/$1 && unsquashfs -d /snap/$1/current *.snap && rm ~/tmp/* }
+            install_snap "core18"
+            install_snap "go"
+            install_snap "gnome-3-34-1804"
+            install_snap "gnome-3-34-1804-sdk"
       - run:
           name: Build the snap
           command: |