diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 0000000000..3eee81f26c
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,13 @@
+# See gitpod image here: https://hub.docker.com/layers/gitpod/workspace-base/latest
+FROM gitpod/workspace-base@sha256:d69d08a0e1fa62b6d8db9e7ffe63dc21a58f0242946d945d776a819aec652130
+
+USER gitpod
+
+# Install fnm to manage Node.js versions
+RUN curl -fsSL https://fnm.vercel.app/install | bash -s
+
+# Install AWS SAM CLI
+RUN curl -LO https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
+  && unzip -q aws-sam-cli-linux-x86_64.zip -d sam-installation \
+  && sudo ./sam-installation/install \
+  && rm -rf sam-installation aws-sam-cli-linux-*
diff --git a/.gitpod.yml b/.gitpod.yml
index 0591321da9..8cf80f54b6 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,13 +1,10 @@
+image:
+    file: .gitpod.Dockerfile
 tasks:
   - init: |
       # Install Nodejs version specified in .nvmrc
-      nvm install
-      nvm use
-      # Install AWS SAM CLI
-      wget https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip
-      unzip aws-sam-cli-linux-x86_64.zip -d sam-installation
-      sudo ./sam-installation/install
-      rm -rf sam-installation aws-sam-cli-linux-*
+      fnm install
+      fnm use
       # Install repo dependencies
       npm run setup-local
 vscode:
@@ -15,4 +12,3 @@ vscode:
     - dbaeumer.vscode-eslint
     - esbenp.prettier-vscode
     - firsttris.vscode-jest-runner
-    - amazonwebservices.aws-toolkit-vscode
\ No newline at end of file