diff --git a/.devcontainer/.vscode/c_cpp_properties.json b/.devcontainer/.vscode/c_cpp_properties.json
deleted file mode 100644
index 2cc60a989..000000000
--- a/.devcontainer/.vscode/c_cpp_properties.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Citus Development Configuration - Postgres 15.3",
-            "includePath": [
-                "/usr/local/include",
-                "/home/citus/.pgenv/src/postgresql-15.3/src/**",
-                "${workspaceFolder}/**",
-                "${workspaceFolder}/src/include/",
-            ],
-            "configurationProvider": "ms-vscode.makefile-tools"
-        },
-        {
-            "name": "Citus Development Configuration - Postgres 14.8",
-            "includePath": [
-                "/usr/local/include",
-                "/home/citus/.pgenv/src/postgresql-14.8/src/**",
-                "${workspaceFolder}/**",
-                "${workspaceFolder}/src/include/",
-            ],
-            "configurationProvider": "ms-vscode.makefile-tools"
-        },
-        {
-            "name": "Citus Development Configuration - Postgres 16beta2",
-            "includePath": [
-                "/usr/local/include",
-                "/home/citus/.pgenv/src/postgresql-16beta2/src/**",
-                "${workspaceFolder}/**",
-                "${workspaceFolder}/src/include/",
-            ],
-            "configurationProvider": "ms-vscode.makefile-tools"
-        },
-    ],
-    "version": 4
-}
\ No newline at end of file
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d0b321787..00b115fe8 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -55,6 +55,7 @@ FROM base AS pg14
 RUN pgenv build 14.8
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
+RUN make -C .pgenv/src/postgresql-*/include install
 
 # create a staging directory with all files we want to copy from our pgenv build
 # we will copy the contents of the staged folder into the final image at once
@@ -66,6 +67,7 @@ FROM base AS pg15
 RUN pgenv build 15.3
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
+RUN make -C .pgenv/src/postgresql-*/include install
 
 # create a staging directory with all files we want to copy from our pgenv build
 # we will copy the contents of the staged folder into the final image at once
@@ -77,6 +79,7 @@ FROM base AS pg16
 RUN pgenv build 16beta2
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
+RUN make -C .pgenv/src/postgresql-*/include install
 
 # create a staging directory with all files we want to copy from our pgenv build
 # we will copy the contents of the staged folder into the final image at once
diff --git a/.devcontainer/Makefile b/.devcontainer/Makefile
index afe57fea1..8f4174104 100644
--- a/.devcontainer/Makefile
+++ b/.devcontainer/Makefile
@@ -2,9 +2,9 @@
 init: ../.vscode/c_cpp_properties.json ../.vscode/launch.json
 
 ../.vscode:
-	mkdir ../.vscode
+	mkdir -p ../.vscode
 
-../.vscode/launch.json: ../.vscode
+../.vscode/launch.json: ../.vscode .vscode/launch.json
 	cp .vscode/launch.json ../.vscode/launch.json
 
 ../.vscode/c_cpp_properties.json: ../.vscode