diff --git a/ingestion/Dockerfile b/ingestion/Dockerfile
index 6b6d8e1f574..981f52c7ca1 100644
--- a/ingestion/Dockerfile
+++ b/ingestion/Dockerfile
@@ -53,7 +53,7 @@ RUN if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; \
 
 ENV LD_LIBRARY_PATH=/instantclient
 
-# Install DB2 OAccess Driver
+# Install DB2 iAccess Driver
 RUN if [[ $(uname -m) == "x86_64" ]]; \
   then \
   curl https://public.dhe.ibm.com/software/ibmi/products/odbc/debs/dists/1.1.0/ibmi-acs-1.1.0.list | tee /etc/apt/sources.list.d/ibmi-acs-1.1.0.list \
@@ -82,11 +82,10 @@ RUN pip install "openmetadata-managed-apis~=${RI_VERSION}" --constraint "https:/
 RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=${RI_VERSION}"
 
 # Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593
-RUN echo "Image built for $(uname -m)"
-RUN if [[ $(uname -m) != "aarch64" ]]; \
- then \
- pip install "ibm-db-sa~=0.4"; \
- fi
+RUN if [[ $(uname -m) == "x86_64" ]]; \
+  then \
+  pip install "openmetadata-ingestion[db2]~=${RI_VERSION}"; \
+  fi
 
 # bump python-daemon for https://github.com/apache/airflow/pull/29916
 RUN pip install "python-daemon>=3.0.0"
diff --git a/ingestion/Dockerfile.ci b/ingestion/Dockerfile.ci
index 6865decfd27..00c62f12eef 100644
--- a/ingestion/Dockerfile.ci
+++ b/ingestion/Dockerfile.ci
@@ -54,7 +54,7 @@ RUN if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; \
 
 ENV LD_LIBRARY_PATH=/instantclient
 
-# Install DB2 OAccess Driver
+# Install DB2 iAccess Driver
 RUN if [[ $(uname -m) == "x86_64" ]]; \
   then \
   curl https://public.dhe.ibm.com/software/ibmi/products/odbc/debs/dists/1.1.0/ibmi-acs-1.1.0.list | tee /etc/apt/sources.list.d/ibmi-acs-1.1.0.list \
@@ -93,11 +93,10 @@ ARG INGESTION_DEPENDENCY="all"
 RUN pip install ".[${INGESTION_DEPENDENCY}]"
 
 # Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593
-RUN echo "Image built for $(uname -m)"
-RUN if [[ $(uname -m) != "aarch64" ]]; \
- then \
- pip install "ibm-db-sa~=0.4"; \
- fi
+RUN if [[ $(uname -m) == "x86_64" ]]; \
+  then \
+  pip install ".[db2]"; \
+  fi
 
 # bump python-daemon for https://github.com/apache/airflow/pull/29916
 RUN pip install "python-daemon>=3.0.0"
diff --git a/ingestion/operators/docker/Dockerfile b/ingestion/operators/docker/Dockerfile
index 4fce68c56de..aa45dda0f21 100644
--- a/ingestion/operators/docker/Dockerfile
+++ b/ingestion/operators/docker/Dockerfile
@@ -59,7 +59,7 @@ RUN if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; \
 
 ENV LD_LIBRARY_PATH=/instantclient
 
-# Install DB2 OAccess Driver
+# Install DB2 iAccess driver
 RUN if [[ $(uname -m) == "x86_64" ]]; \
   then \
   curl https://public.dhe.ibm.com/software/ibmi/products/odbc/debs/dists/1.1.0/ibmi-acs-1.1.0.list | tee /etc/apt/sources.list.d/ibmi-acs-1.1.0.list \
@@ -86,12 +86,12 @@ RUN pip install --upgrade pip
 RUN pip install "openmetadata-ingestion[airflow]~=${RI_VERSION}"
 RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=${RI_VERSION}"
 
+
 # Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593
-RUN echo "Image built for $(uname -m)"
-RUN if [[ $(uname -m) == "arm64" ]]; \
-    then \
-    pip install "ibm-db-sa~=0.4"; \
-    fi
+RUN if [[ $(uname -m) == "x86_64" ]]; \
+  then \
+  pip install "openmetadata-ingestion[db2]~=${RI_VERSION}"; \
+  fi
 
 # Uninstalling psycopg2-binary and installing psycopg2 instead
 # because the psycopg2-binary generates a architecture specific error
diff --git a/ingestion/operators/docker/Dockerfile.ci b/ingestion/operators/docker/Dockerfile.ci
index badf23a59c8..00d2d0c6329 100644
--- a/ingestion/operators/docker/Dockerfile.ci
+++ b/ingestion/operators/docker/Dockerfile.ci
@@ -59,7 +59,7 @@ RUN if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; \
 
 ENV LD_LIBRARY_PATH=/instantclient
 
-# Install DB2 OAccess Driver
+# Install DB2 iAccess Driver
 RUN if [[ $(uname -m) == "x86_64" ]]; \
   then \
   curl https://public.dhe.ibm.com/software/ibmi/products/odbc/debs/dists/1.1.0/ibmi-acs-1.1.0.list | tee /etc/apt/sources.list.d/ibmi-acs-1.1.0.list \
@@ -84,16 +84,15 @@ ARG INGESTION_DEPENDENCY="all"
 RUN pip install ".[airflow]"
 RUN pip install ".[${INGESTION_DEPENDENCY}]"
 
+# Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593
+RUN if [[ $(uname -m) == "x86_64" ]]; \
+  then \
+  pip install ".[db2]"; \
+  fi
+
 # Required for Airflow DockerOperator, as we need to run the workflows from a `python main.py` command in the container.
 COPY ingestion/operators/docker/*.py .
 
-# Temporary workaround for https://github.com/open-metadata/OpenMetadata/issues/9593
-RUN echo "Image built for $(uname -m)"
-RUN if [[ $(uname -m) == "arm64" ]]; \
-    then \
-    pip install "ibm-db-sa~=0.4"; \
-    fi
-
 # Uninstalling psycopg2-binary and installing psycopg2 instead
 # because the psycopg2-binary generates a architecture specific error
 # while authenticating connection with the airflow, psycopg2 solves this error