diff --git a/modules/rules_oci/0.3.6/MODULE.bazel b/modules/rules_oci/0.3.6/MODULE.bazel
new file mode 100644
index 00000000000..51b23977154
--- /dev/null
+++ b/modules/rules_oci/0.3.6/MODULE.bazel
@@ -0,0 +1,21 @@
+"bazel-contrib/rules_oci"
+
+module(
+    name = "rules_oci",
+    compatibility_level = 1,
+    version = "0.3.6",
+)
+
+bazel_dep(name = "aspect_bazel_lib", version = "1.28.0")
+bazel_dep(name = "bazel_skylib", version = "1.4.1")
+bazel_dep(name = "rules_pkg", version = "0.8.1")
+bazel_dep(name = "platforms", version = "0.0.5")
+
+oci = use_extension("//oci:extensions.bzl", "oci")
+oci.toolchains(
+    crane_version = "v0.12.0",
+    zot_version = "v1.4.3-rc3",
+)
+use_repo(oci, "oci_crane_toolchains", "oci_zot_toolchains", "oci_st_toolchains")
+
+register_toolchains("@oci_crane_toolchains//:all", "@oci_zot_toolchains//:all", "@oci_st_toolchains//:all")
diff --git a/modules/rules_oci/0.3.6/patches/module_dot_bazel_version.patch b/modules/rules_oci/0.3.6/patches/module_dot_bazel_version.patch
new file mode 100644
index 00000000000..730253bd527
--- /dev/null
+++ b/modules/rules_oci/0.3.6/patches/module_dot_bazel_version.patch
@@ -0,0 +1,15 @@
+Index: MODULE.bazel
+===================================================================
+--- MODULE.bazel
++++ MODULE.bazel
+@@ -2,9 +2,9 @@
+ 
+ module(
+     name = "rules_oci",
+     compatibility_level = 1,
+-    version = "0.0.0",
++    version = "0.3.6",
+ )
+ 
+ bazel_dep(name = "aspect_bazel_lib", version = "1.28.0")
+ bazel_dep(name = "bazel_skylib", version = "1.4.1")
diff --git a/modules/rules_oci/0.3.6/presubmit.yml b/modules/rules_oci/0.3.6/presubmit.yml
new file mode 100644
index 00000000000..34333e34223
--- /dev/null
+++ b/modules/rules_oci/0.3.6/presubmit.yml
@@ -0,0 +1,10 @@
+bcr_test_module:
+  module_path: "e2e/smoke"
+  matrix:
+    platform: ["debian10", "macos", "ubuntu2004", "windows"]
+  tasks:
+    run_tests:
+      name: "Run test module"
+      platform: ${{ platform }}
+      test_targets:
+        - "//..."
diff --git a/modules/rules_oci/0.3.6/source.json b/modules/rules_oci/0.3.6/source.json
new file mode 100644
index 00000000000..8af41586b62
--- /dev/null
+++ b/modules/rules_oci/0.3.6/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-4wjPdydYUy9TPtrNVeuDomCKEfEkwVmbsLAEcnMW/aE=",
+    "strip_prefix": "rules_oci-0.3.6",
+    "url": "https://github.com/bazel-contrib/rules_oci/releases/download/v0.3.6/rules_oci-v0.3.6.tar.gz",
+    "patches": {
+        "module_dot_bazel_version.patch": "sha256-PStnaqDPqEDRVNkaVSepGS40lMjm8NNdqLEtyaAbhFM="
+    },
+    "patch_strip": 0
+}
diff --git a/modules/rules_oci/metadata.json b/modules/rules_oci/metadata.json
index a30ed6dbaa8..531a729c9d5 100644
--- a/modules/rules_oci/metadata.json
+++ b/modules/rules_oci/metadata.json
@@ -16,7 +16,8 @@
         "github:bazel-contrib/rules_oci"
     ],
     "versions": [
-        "0.3.5"
+        "0.3.5",
+        "0.3.6"
     ],
     "yanked_versions": {}
 }