diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 8a4acf920..f76d496a5 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -42,23 +42,20 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Install Python dependencies
-        if: github.event.repository.fork == false
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          pip install git+https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git
-          pip install \
-            mkdocs-minify-plugin>=0.3 \
-            mkdocs-redirects>=1.0
-
-      - name: Install Python dependencies
-        if: github.event.repository.fork == true
         run: |
           pip install .
           pip install \
             mkdocs-minify-plugin>=0.3 \
             mkdocs-redirects>=1.0
 
+      - name: Install Insiders build
+        if: github.event.repository.fork == false
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: |
+          git clone --depth 1 https://${GH_TOKEN}@github.com/squidfunk/mkdocs-material-insiders.git material
+          echo "::set-env name=THEME_DIR::mkdocs-material-insiders/material"
+
       - name: Deploy documentation
         env:
           GOOGLE_ANALYTICS_KEY: ${{ secrets.GOOGLE_ANALYTICS_KEY }}
diff --git a/mkdocs.yml b/mkdocs.yml
index 5dbf2fea0..005ed81ee 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -38,7 +38,7 @@ copyright: Copyright © 2016 - 2021 Martin Donath
 # Configuration
 theme:
   name: null
-  custom_dir: material
+  custom_dir: !ENV [THEME_DIR, "material"]
 
   # Static files
   static_templates:
@@ -105,7 +105,7 @@ plugins:
 extra:
   analytics:
     provider: google
-    property: !!python/object/apply:os.getenv ["GOOGLE_ANALYTICS_KEY"]
+    property: !ENV GOOGLE_ANALYTICS_KEY
   social:
     - icon: fontawesome/brands/github
       link: https://github.com/squidfunk