diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 9dd82179b0..11df83de19 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -8,19 +8,6 @@ RUN su vscode -c "/usr/local/rvm/bin/rvm fix-permissions"
 # The value is a comma-separated list of allowed domains 
 ENV RAILS_DEVELOPMENT_HOSTS=".githubpreview.dev,.preview.app.github.dev,.app.github.dev"
 
-# Build PDFTK
-FROM ghcr.io/graalvm/graalvm-ce:22.2.0 as pdftkbuilder
-RUN gu install native-image
-WORKDIR /build
-RUN curl https://gitlab.com/api/v4/projects/5024297/packages/generic/pdftk-java/v3.3.3/pdftk-all.jar --output pdftk-all.jar \
-	&& curl https://gitlab.com/pdftk-java/pdftk/-/raw/v3.3.3/META-INF/native-image/reflect-config.json --output reflect-config.json \
-	&& curl https://gitlab.com/pdftk-java/pdftk/-/raw/v3.3.3/META-INF/native-image/resource-config.json --output resource-config.json \
-	&& native-image --static -jar pdftk-all.jar \
-        -H:Name=pdftk \
-        -H:ResourceConfigurationFiles='resource-config.json' \
-        -H:ReflectionConfigurationFiles='reflect-config.json' \
-        -H:GenerateDebugInfo=0
-
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 #     && apt-get -y install --no-install-recommends <your-package-list-here>
diff --git a/.devcontainer/boot.sh b/.devcontainer/boot.sh
old mode 100644
new mode 100755
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 455b852d27..160bfce160 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,7 +10,7 @@
 	"features": {
 		"ghcr.io/devcontainers/features/sshd:1": {},
     "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
-      "packages": "libpq-dev"
+      "packages": "libpq-dev, pdftk"
     },
     "ghcr.io/devcontainers/features/git:1": {
       "version": "latest"
@@ -37,7 +37,7 @@
 	"forwardPorts": [3000],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "boot.sh",
+	"postCreateCommand": ".devcontainer/boot.sh",
 
 	// Configure tool-specific properties.
 	"customizations": {
diff --git a/config/database.yml b/config/database.yml
index 3480e0f069..d9cf39f508 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -7,10 +7,16 @@ default: &default
 development:
   <<: *default
   database: ccq_development
+  host: db
+  username: postgres
+  password: postgres
 
 test:
   <<: *default
   database: ccq_test
+  host: db
+  username: postgres
+  password: postgres
 
 production:
   <<: *default