diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..940b043
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,18 @@
+# act
+*.env
+*.secrets
+
+# git
+.git
+.gitattributes
+
+# commitlint
+commitlint.config.js
+.husky
+
+# Dependencies
+node_modules
+package*.json
+
+# Docs
+*.md
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9cb3ff1..74e2b2d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,6 +7,9 @@ on:
             - main
     pull_request:
 
+permissions:
+  packages: write
+
 jobs:
     prebuild-devcontainer:
         runs-on: ubuntu-latest
@@ -26,7 +29,14 @@ jobs:
               uses: docker/login-action@v2
               with:
                 registry: ghcr.io
-                username: ${{ github.actor }}
+                username: ${{ github.actor || 'petersellars' }}
                 password: ${{ secrets.GITHUB_TOKEN }}
-
+                
+            # Per-build the container image
+            - name: Pre-build the container image
+              uses: devcontainers/ci@v0.3
+              with:
+                imageName: ghcr.io/catosplace-devcontainers/engineering-base
+                cacheFrom: ghcr.io/catosplace-devcontainers/engineering-base
+                push: always
           
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 408f4f3..a72594c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-# act environment file
-.env
-.secrets
+# act
+*.env
+*.secrets
 
-# Dependency directories
-node_modules/
\ No newline at end of file
+# Dependencies
+node_modules
\ No newline at end of file