diff --git a/.ci/Dockerfile b/.ci/Dockerfile
index df34232c..1574e810 100644
--- a/.ci/Dockerfile
+++ b/.ci/Dockerfile
@@ -23,7 +23,9 @@ RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linu
 COPY . /registry
 
 # Download the registry build tools
-RUN git clone https://github.com/devfile/registry-support.git /registry-support
+# Freeze index/generator version at v1.1.0 until Go 1.19 is supported, 
+# see https://github.com/devfile/api/issues/1473
+RUN git clone https://github.com/devfile/registry-support.git -b v1.1.0 /registry-support
 
 # Run the registry build tools
 RUN bash /registry-support/build-tools/build.sh /registry /build
diff --git a/.ci/Dockerfile.offline b/.ci/Dockerfile.offline
index 944f3459..d243da73 100644
--- a/.ci/Dockerfile.offline
+++ b/.ci/Dockerfile.offline
@@ -23,7 +23,9 @@ RUN curl -sL -O https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linu
 COPY . /registry
 
 # Download the registry build tools
-RUN git clone https://github.com/devfile/registry-support.git /registry-support
+# Freeze index/generator version at v1.1.0 until Go 1.19 is supported, 
+# see https://github.com/devfile/api/issues/1473
+RUN git clone https://github.com/devfile/registry-support.git -b v1.1.0 /registry-support
 
 # Download all the offline parent devfiles
 RUN bash /registry-support/build-tools/dl_parent_devfiles.sh