diff --git a/.devcontainer/.vscode/c_cpp_properties.json b/.devcontainer/.vscode/c_cpp_properties.json
index 0b07ea8f0..2cc60a989 100644
--- a/.devcontainer/.vscode/c_cpp_properties.json
+++ b/.devcontainer/.vscode/c_cpp_properties.json
@@ -20,6 +20,16 @@
             ],
             "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 46df870a7..7d93a53cc 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -151,7 +151,7 @@ COPY --from=uncrustify-builder /uncrustify/usr/ /usr/
 
 COPY --from=pg14 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
 COPY --from=pg15 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
-# COPY --from=pg16 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
+COPY --from=pg16 /home/citus/.pgenv-staging/ /home/citus/.pgenv/
 
 COPY --from=pipenv /home/citus/.local/share/virtualenvs/ /home/citus/.local/share/virtualenvs/