diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..842cfb09c5
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,11 @@
+{
+    "name": "CRC environment",
+    "image": "registry.access.redhat.com/ubi9/go-toolset:latest",
+
+    "customizations": {
+        "vscode": {
+            "extensions": [
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/.github/workflows/verify-devcontainer.yml b/.github/workflows/verify-devcontainer.yml
new file mode 100644
index 0000000000..3509338ade
--- /dev/null
+++ b/.github/workflows/verify-devcontainer.yml
@@ -0,0 +1,14 @@
+name: Verify make cross in devcontainer
+on:
+  push:
+    branches:
+      - "main"
+  pull_request: {}
+jobs:
+  verify-devcontainer:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Run `git clone` and `make cross` against devcontainer
+        run: >
+          podman run registry.access.redhat.com/ubi9/go-toolset:latest \
+            sh -c "git clone https://github.com/crc-org/crc --depth 1 && cd crc && make cross"