diff --git a/.devcontainer/Containerfile b/.devcontainer/Containerfile
new file mode 100644
index 0000000000..14bb7ecf35
--- /dev/null
+++ b/.devcontainer/Containerfile
@@ -0,0 +1,8 @@
+FROM registry.access.redhat.com/ubi9/go-toolset:latest
+
+USER root
+
+RUN dnf install -y \
+        sudo git-core \
+    && dnf clean all \
+    && rm -rf /var/cache/yum
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..873c81c4f7
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,13 @@
+{
+    "name": "CRC environment",
+    "build": {
+        "dockerfile": "Containerfile"
+    },
+
+    "customizations": {
+        "vscode": {
+            "extensions": [
+            ]
+        }
+    }
+}
\ No newline at end of file