diff --git a/backend/dataall/modules/datapipelines/cdk/datapipelines_pipeline.py b/backend/dataall/modules/datapipelines/cdk/datapipelines_pipeline.py
index ea8d34f3e..f967458cd 100644
--- a/backend/dataall/modules/datapipelines/cdk/datapipelines_pipeline.py
+++ b/backend/dataall/modules/datapipelines/cdk/datapipelines_pipeline.py
@@ -264,7 +264,7 @@ def __init__(self, scope, id, target_uri: str = None, **kwargs):
                     id=f'{pipeline.name}-build-{env.stage}',
                     environment=codebuild.BuildEnvironment(
                         privileged=True,
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_3,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                         environment_variables=PipelineStack.make_environment_variables(
                             pipeline=pipeline,
                             pipeline_environment=env,
@@ -335,7 +335,7 @@ def __init__(self, scope, id, target_uri: str = None, **kwargs):
                     id=f'{pipeline.name}-build-{env.stage}',
                     environment=codebuild.BuildEnvironment(
                         privileged=True,
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_3,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                         environment_variables=PipelineStack.make_environment_variables(
                             pipeline=pipeline,
                             pipeline_environment=env,
diff --git a/backend/docker/dev/Dockerfile b/backend/docker/dev/Dockerfile
index 2aba2a8a4..3fc7bc29d 100644
--- a/backend/docker/dev/Dockerfile
+++ b/backend/docker/dev/Dockerfile
@@ -1,24 +1,30 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
-ARG NODE_VERSION=16
+ARG NODE_VERSION=18
 ARG NVM_VERSION=v0.37.2
-ARG PYTHON_VERSION=python3.8
+ARG PYTHON_VERSION=python3.9
 
-RUN yum clean all
-RUN yum -y install shadow-utils wget
-RUN yum -y install openssl-devel bzip2-devel libffi-devel postgresql-devel gcc unzip tar gzip
-RUN amazon-linux-extras install $PYTHON_VERSION
-RUN yum -y install python38-devel
-RUN yum -y install git
+# Clean cache
+RUN dnf clean all
 
-RUN /bin/bash -c "ln -s /usr/bin/${PYTHON_VERSION} /usr/bin/python3"
+# Installing libraries
+RUN dnf -y install -y \
+    shadow-utils wget openssl-devel bzip2-devel libffi-devel \
+    postgresql-devel gcc unzip tar gzip
+
+# Install Python
+RUN dnf install $PYTHON_VERSION
+RUN dnf -y install python3-pip python3-devel git
 
 RUN useradd -m app
 
+## Add source
 WORKDIR /build
 
+# Configuring path
 RUN touch ~/.bashrc
 
+# Install AWS CLI
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
 RUN unzip awscliv2.zip
 RUN ./aws/install
@@ -27,9 +33,11 @@ COPY ./docker/dev/wait-for-it.sh /build/wait-for-it.sh
 RUN chmod +x /build/wait-for-it.sh
 RUN chown -R app:root /build/wait-for-it.sh
 
+## Add source
 WORKDIR /dataall
 RUN touch ~/.bashrc
 
+# Configuring Node and CDK
 RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/$NVM_VERSION/install.sh | bash
 RUN /bin/bash -c ". ~/.nvm/nvm.sh && \
 	nvm install $NODE_VERSION && nvm use $NODE_VERSION && \
@@ -46,17 +54,20 @@ $PATH" >> ~/.bashrc && \
 
 RUN /bin/bash -c  ". ~/.nvm/nvm.sh && cdk --version"
 
-COPY ./requirements.txt dh.requirements.txt
+# App specific requirements
+COPY ./requirements.txt requirements.txt
 COPY ./dataall/base/cdkproxy/requirements.txt cdk.requirements.txt
-COPY ./dataall /dataall
 
+# Install App requirements
+RUN /bin/bash -c "${PYTHON_VERSION} -m pip install setuptools"
+RUN /bin/bash -c "${PYTHON_VERSION} -m pip install -r requirements.txt"
+RUN /bin/bash -c "${PYTHON_VERSION} -m pip install -r cdk.requirements.txt"
+
+# App code
+COPY ./dataall /dataall
 ADD ./cdkproxymain.py /cdkproxymain.py
 ADD ./local_graphql_server.py /local_graphql_server.py
 
-RUN /bin/bash -c "${PYTHON_VERSION} -m pip install -U pip "
-RUN /bin/bash -c "${PYTHON_VERSION} -m pip install -r dh.requirements.txt"
-RUN /bin/bash -c "${PYTHON_VERSION} -m pip install -r cdk.requirements.txt"
-
 WORKDIR /
 
 ENTRYPOINT [ "/bin/bash", "-c", ". ~/.nvm/nvm.sh && uvicorn cdkproxymain:app --host 0.0.0.0 --port 8080" ]
diff --git a/backend/docker/prod/ecs/Dockerfile b/backend/docker/prod/ecs/Dockerfile
index aadf853ab..83af5d7bd 100644
--- a/backend/docker/prod/ecs/Dockerfile
+++ b/backend/docker/prod/ecs/Dockerfile
@@ -1,24 +1,28 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
-ARG NODE_VERSION=16
+ARG NODE_VERSION=18
 ARG NVM_VERSION=v0.37.2
 ARG DEEQU_VERSION=2.0.0-spark-3.1
-ARG PYTHON_VERSION=python3.8
+ARG PYTHON_VERSION=python3.9
+
+# Clean cache
+RUN dnf upgrade -y;\
+    find /var/tmp -name "*.rpm" -print -delete ;\
+    find /tmp -name "*.rpm" -print -delete ;\
+    dnf autoremove -y; \
+    dnf clean all; rm -rfv /var/cache/dnf
 
 # Installing libraries
-RUN yum upgrade -y \
-    && find /var/tmp -name "*.rpm" -print -delete \
-    && find /tmp -name "*.rpm" -print -delete \
-    && yum autoremove -y \
-    && yum clean all \
-    && rm -rfv /var/cache/yum \
-    && yum install -y \
+RUN dnf -y install \
     shadow-utils wget openssl-devel bzip2-devel libffi-devel \
-    postgresql-devel gcc unzip tar gzip \
-    && amazon-linux-extras install $PYTHON_VERSION \
-    && yum install -y python38-devel git \
-    && /bin/bash -c "ln -s /usr/bin/${PYTHON_VERSION} /usr/bin/python3" \
-    && curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o /tmp/awscliv2.zip \
+    postgresql-devel gcc unzip tar gzip
+
+# Install Python
+RUN dnf install $PYTHON_VERSION
+RUN dnf -y install python3-pip python3-devel git
+
+# Install AWS CLI
+RUN curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o /tmp/awscliv2.zip \
     && unzip -q /tmp/awscliv2.zip -d /opt \
     && /opt/aws/install --update -i /usr/local/aws-cli -b /usr/local/bin \
     && rm /tmp/awscliv2.zip \
@@ -33,8 +37,9 @@ RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/$NVM_VERSION/insta
     && /bin/bash -c ". ~/.nvm/nvm.sh && \
     nvm install $NODE_VERSION && nvm use $NODE_VERSION && \
     npm install -g aws-cdk && \
-    nvm alias default node && nvm cache clear" \
-    && echo export PATH="\
+    nvm alias default node && nvm cache clear"
+
+RUN echo export PATH="\
     /root/.nvm/versions/node/${NODE_VERSION}/bin:\
     $(${PYTHON_VERSION} -m site --user-base)/bin:\
     $(python3 -m site --user-base)/bin:\
@@ -42,22 +47,25 @@ RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/$NVM_VERSION/insta
      echo "nvm use ${NODE_VERSION} 1> /dev/null" >> ~/.bashrc \
     && /bin/bash -c  ". ~/.nvm/nvm.sh && cdk --version"
 
-RUN $PYTHON_VERSION -m pip install -U pip
-
-# App specific
-ADD backend/requirements.txt /dh.requirements.txt
+# App specific requirements
+ADD backend/requirements.txt /requirements.txt
 ADD backend/dataall/base/cdkproxy/requirements.txt /cdk.requirements.txt
 
-RUN /bin/bash -c "pip3.8 install -r /dh.requirements.txt" \
-    && /bin/bash -c "pip3.8 install -r /cdk.requirements.txt"
+# Install App requirements
+RUN /bin/bash -c "${PYTHON_VERSION} -m pip install setuptools"
+RUN /bin/bash -c "${PYTHON_VERSION} -m pip install -r requirements.txt"
+RUN /bin/bash -c "${PYTHON_VERSION} -m pip install -r cdk.requirements.txt"
 
+# App code
 ADD backend/dataall /dataall
 VOLUME ["/dataall"]
 ADD backend/cdkproxymain.py /cdkproxymain.py
 
+# App configuration file
 ENV config_location="/config.json"
 COPY config.json /config.json
 
+# Glue profiling jobs jars
 RUN mkdir -p dataall/modules/datasets/cdk/assets/glueprofilingjob/jars/
 ADD https://repo1.maven.org/maven2/com/amazon/deequ/deequ/$DEEQU_VERSION/deequ-$DEEQU_VERSION.jar /dataall/modules/datasets/cdk/assets/glueprofilingjob/jars/
 
diff --git a/backend/docker/prod/lambda/Dockerfile b/backend/docker/prod/lambda/Dockerfile
index 74609e98c..4ba78a8a7 100644
--- a/backend/docker/prod/lambda/Dockerfile
+++ b/backend/docker/prod/lambda/Dockerfile
@@ -1,28 +1,38 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
 ARG FUNCTION_DIR="/home/app/"
-ARG PYTHON_VERSION=python3.8
+ARG PYTHON_VERSION=python3.9
 
-RUN yum upgrade -y;\
+# Clean cache
+RUN dnf upgrade -y;\
     find /var/tmp -name "*.rpm" -print -delete ;\
     find /tmp -name "*.rpm" -print -delete ;\
-    yum autoremove -y; \
-    yum clean packages; yum clean headers; yum clean metadata; yum clean all; rm -rfv /var/cache/yum
+    dnf autoremove -y; \
+    dnf clean all; rm -rfv /var/cache/dnf
 
-RUN yum -y install shadow-utils wget
-RUN yum -y install openssl-devel bzip2-devel libffi-devel postgresql-devel gcc unzip tar gzip
-RUN amazon-linux-extras install $PYTHON_VERSION
-RUN yum -y install python38-devel
+# Install libraries
+RUN dnf -y install \
+    shadow-utils wget openssl-devel bzip2-devel libffi-devel \
+    postgresql-devel gcc unzip tar gzip
 
-## Add your source
+# Install Python
+RUN dnf install $PYTHON_VERSION
+RUN dnf -y install python3-pip python3-devel
+
+## Add source
 WORKDIR ${FUNCTION_DIR}
 
+# App specific requirements
 COPY backend/requirements.txt ./requirements.txt
-RUN $PYTHON_VERSION -m pip install -U pip
-RUN $PYTHON_VERSION -m pip install -r requirements.txt -t .
 
+# Install App requirements
+RUN /bin/bash -c "${PYTHON_VERSION} -m pip install setuptools"
+RUN /bin/bash -c "${PYTHON_VERSION} -m pip install -r requirements.txt"
+
+# App code
 COPY backend/. ./
 
+# App configuration file
 ENV config_location="config.json"
 COPY config.json ./config.json
 
@@ -30,5 +40,5 @@ COPY config.json ./config.json
 RUN $PYTHON_VERSION -m pip install awslambdaric --target ${FUNCTION_DIR}
 
 # Command can be overwritten by providing a different command in the template directly.
-ENTRYPOINT [ "python3.8", "-m", "awslambdaric" ]
+ENTRYPOINT [ "python3.9", "-m", "awslambdaric" ]
 CMD ["auth_handler.handler"]
diff --git a/deploy/stacks/container.py b/deploy/stacks/container.py
index 25d1775e3..1c0c6a85e 100644
--- a/deploy/stacks/container.py
+++ b/deploy/stacks/container.py
@@ -81,7 +81,7 @@ def __init__(
             container_definitions=[ecs.CfnTaskDefinition.ContainerDefinitionProperty(
                 image=cdkproxy_image.image_name,
                 name=cdkproxy_container_name,
-                command=['python3.8', '-m', 'dataall.core.stacks.tasks.cdkproxy'],
+                command=['python3.9', '-m', 'dataall.core.stacks.tasks.cdkproxy'],
                 environment=[
                     ecs.CfnTaskDefinition.KeyValuePairProperty(
                         name="AWS_REGION",
@@ -156,7 +156,7 @@ def __init__(
 
         stacks_updater, stacks_updater_task_def = self.set_scheduled_task(
             cluster=cluster,
-            command=['python3.8', '-m', 'dataall.core.environment.tasks.env_stacks_updater'],
+            command=['python3.9', '-m', 'dataall.core.environment.tasks.env_stacks_updater'],
             container_id=f'container',
             ecr_repository=ecr_repository,
             environment=self._create_env('INFO'),
@@ -213,7 +213,7 @@ def __init__(
     def add_catalog_indexer_task(self):
         catalog_indexer_task, catalog_indexer_task_def = self.set_scheduled_task(
             cluster=self.ecs_cluster,
-            command=['python3.8', '-m', 'dataall.modules.catalog.tasks.catalog_indexer_task'],
+            command=['python3.9', '-m', 'dataall.modules.catalog.tasks.catalog_indexer_task'],
             container_id=f'container',
             ecr_repository=self._ecr_repository,
             environment=self._create_env('INFO'),
@@ -251,7 +251,7 @@ def add_share_management_task(self):
                 repository=self._ecr_repository, tag=self._cdkproxy_image_tag
             ),
             environment=self._create_env('DEBUG'),
-            command=['python3.8', '-m', 'dataall.modules.dataset_sharing.tasks.share_manager_task'],
+            command=['python3.9', '-m', 'dataall.modules.dataset_sharing.tasks.share_manager_task'],
             logging=ecs.LogDriver.aws_logs(
                 stream_prefix='task',
                 log_group=self.create_log_group(
@@ -281,7 +281,7 @@ def add_subscription_task(self):
         subscriptions_task, subscription_task_def = self.set_scheduled_task(
             cluster=self.ecs_cluster,
             command=[
-                'python3.8',
+                'python3.9',
                 '-m',
                 'dataall.modules.datasets.tasks.dataset_subscription_task',
             ],
@@ -306,7 +306,7 @@ def add_subscription_task(self):
     def add_bucket_policy_updater_task(self):
         update_bucket_policies_task, update_bucket_task_def = self.set_scheduled_task(
             cluster=self.ecs_cluster,
-            command=['python3.8', '-m', 'dataall.modules.datasets.tasks.bucket_policy_updater'],
+            command=['python3.9', '-m', 'dataall.modules.datasets.tasks.bucket_policy_updater'],
             container_id=f'container',
             ecr_repository=self._ecr_repository,
             environment=self._create_env('DEBUG'),
@@ -328,7 +328,7 @@ def add_bucket_policy_updater_task(self):
     def add_sync_dataset_table_task(self):
         sync_tables_task, sync_tables_task_def = self.set_scheduled_task(
             cluster=self.ecs_cluster,
-            command=['python3.8', '-m', 'dataall.modules.datasets.tasks.tables_syncer'],
+            command=['python3.9', '-m', 'dataall.modules.datasets.tasks.tables_syncer'],
             container_id=f'container',
             ecr_repository=self._ecr_repository,
             environment=self._create_env('INFO'),
diff --git a/deploy/stacks/dbmigration.py b/deploy/stacks/dbmigration.py
index d71320ebe..bb28c2e36 100644
--- a/deploy/stacks/dbmigration.py
+++ b/deploy/stacks/dbmigration.py
@@ -141,7 +141,7 @@ def __init__(
             id=f'DBMigrationCBProject{envname}',
             project_name=f'{resource_prefix}-{envname}-dbmigration',
             environment=codebuild.BuildEnvironment(
-                build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_3,
+                build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
             ),
             role=self.build_project_role,
             build_spec=codebuild.BuildSpec.from_object(
diff --git a/deploy/stacks/pipeline.py b/deploy/stacks/pipeline.py
index 538216a4b..e961b666a 100644
--- a/deploy/stacks/pipeline.py
+++ b/deploy/stacks/pipeline.py
@@ -137,7 +137,7 @@ def __init__(
                 'Synth',
                 input=source,
                 build_environment=codebuild.BuildEnvironment(
-                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                 ),
                 commands=[
                     f'aws codeartifact login --tool npm --repository {self.codeartifact.codeartifact_npm_repo_name} --domain {self.codeartifact.codeartifact_domain_name} --domain-owner {self.codeartifact.domain.attr_owner}',
@@ -430,7 +430,7 @@ def set_quality_gate_stage(self):
                 pipelines.CodeBuildStep(
                     id='ValidateDBMigrations',
                     build_environment=codebuild.BuildEnvironment(
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     ),
                     commands=[
                         f'aws codeartifact login --tool pip --repository {self.codeartifact.codeartifact_pip_repo_name} --domain {self.codeartifact.codeartifact_domain_name} --domain-owner {self.codeartifact.domain.attr_owner}',
@@ -447,7 +447,7 @@ def set_quality_gate_stage(self):
                 pipelines.CodeBuildStep(
                     id='SecurityChecks',
                     build_environment=codebuild.BuildEnvironment(
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     ),
                     commands=[
                         f'aws codeartifact login --tool pip --repository {self.codeartifact.codeartifact_pip_repo_name} --domain {self.codeartifact.codeartifact_domain_name} --domain-owner {self.codeartifact.domain.attr_owner}',
@@ -462,7 +462,7 @@ def set_quality_gate_stage(self):
                 pipelines.CodeBuildStep(
                     id='Lint',
                     build_environment=codebuild.BuildEnvironment(
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     ),
                     commands=[
                         f'aws codeartifact login --tool pip --repository {self.codeartifact.codeartifact_pip_repo_name} --domain {self.codeartifact.codeartifact_domain_name} --domain-owner {self.codeartifact.domain.attr_owner}',
@@ -484,7 +484,7 @@ def set_quality_gate_stage(self):
                 pipelines.CodeBuildStep(
                     id='IntegrationTests',
                     build_environment=codebuild.BuildEnvironment(
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     ),
                     partial_build_spec=codebuild.BuildSpec.from_object(
                         dict(
@@ -518,7 +518,7 @@ def set_quality_gate_stage(self):
                 pipelines.CodeBuildStep(
                     id='UploadCodeToS3',
                     build_environment=codebuild.BuildEnvironment(
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     ),
                     commands=[
                         'mkdir -p source_build',
@@ -538,7 +538,7 @@ def set_quality_gate_stage(self):
                 pipelines.CodeBuildStep(
                     id='UploadCodeToS3',
                     build_environment=codebuild.BuildEnvironment(
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     ),
                     commands=[
                         'mkdir -p source_build',
@@ -576,7 +576,7 @@ def set_ecr_stage(
             pipelines.CodeBuildStep(
                 id='LambdaImage',
                 build_environment=codebuild.BuildEnvironment(
-                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     privileged=True,
                     environment_variables={
                         'REPOSITORY_URI': codebuild.BuildEnvironmentVariable(
@@ -594,7 +594,7 @@ def set_ecr_stage(
             pipelines.CodeBuildStep(
                 id='ECSImage',
                 build_environment=codebuild.BuildEnvironment(
-                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     privileged=True,
                     environment_variables={
                         'REPOSITORY_URI': codebuild.BuildEnvironmentVariable(
@@ -660,7 +660,7 @@ def set_db_migration_stage(
             pipelines.CodeBuildStep(
                 id='MigrateDB',
                 build_environment=codebuild.BuildEnvironment(
-                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                 ),
                 commands=[
                     'mkdir ~/.aws/ && touch ~/.aws/config',
@@ -690,7 +690,7 @@ def set_stacks_updater_stage(
             pipelines.CodeBuildStep(
                 id='StacksUpdater',
                 build_environment=codebuild.BuildEnvironment(
-                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                 ),
                 commands=[
                     'mkdir ~/.aws/ && touch ~/.aws/config',
@@ -730,7 +730,7 @@ def set_cloudfront_stage(self, target_env):
             pipelines.CodeBuildStep(
                 id='DeployFrontEnd',
                 build_environment=codebuild.BuildEnvironment(
-                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                     compute_type=codebuild.ComputeType.LARGE,
                 ),
                 commands=[
@@ -752,6 +752,7 @@ def set_cloudfront_stage(self, target_env):
                     'pip install beautifulsoup4',
                     'python deploy/configs/frontend_config.py',
                     'export AWS_DEFAULT_REGION=us-east-1',
+                    'export AWS_REGION=us-east-1',
                     f"export distributionId=$(aws ssm get-parameter --name /dataall/{target_env['envname']}/CloudfrontDistributionId --profile buildprofile --output text --query 'Parameter.Value')",
                     f"export bucket=$(aws ssm get-parameter --name /dataall/{target_env['envname']}/CloudfrontDistributionBucket --profile buildprofile --output text --query 'Parameter.Value')",
                     'export NODE_OPTIONS="--max-old-space-size=6144"',
@@ -781,7 +782,7 @@ def set_cloudfront_stage(self, target_env):
             pipelines.CodeBuildStep(
                 id='UpdateDocumentation',
                 build_environment=codebuild.BuildEnvironment(
-                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                 ),
                 commands=[
                     f'aws codeartifact login --tool pip --repository {self.codeartifact.codeartifact_pip_repo_name} --domain {self.codeartifact.codeartifact_domain_name} --domain-owner {self.codeartifact.domain.attr_owner}',
@@ -789,6 +790,7 @@ def set_cloudfront_stage(self, target_env):
                     '. ./.env.assumed_role',
                     'aws sts get-caller-identity',
                     'export AWS_DEFAULT_REGION=us-east-1',
+                    'export AWS_REGION=us-east-1',
                     f"export distributionId=$(aws ssm get-parameter --name /dataall/{target_env['envname']}/cloudfront/docs/user/CloudfrontDistributionId --output text --query 'Parameter.Value')",
                     f"export bucket=$(aws ssm get-parameter --name /dataall/{target_env['envname']}/cloudfront/docs/user/CloudfrontDistributionBucket --output text --query 'Parameter.Value')",
                     'cd documentation/userguide',
@@ -806,7 +808,7 @@ def cw_rum_config_action(self, target_env):
         return pipelines.CodeBuildStep(
             id='ConfigureRUM',
             build_environment=codebuild.BuildEnvironment(
-                build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
             ),
             commands=[
                 f'export envname={target_env["envname"]}',
@@ -832,7 +834,7 @@ def cognito_config_action(self, target_env):
         return pipelines.CodeBuildStep(
             id='ConfigureCognito',
             build_environment=codebuild.BuildEnvironment(
-                build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
             ),
             commands=[
                 f'export envname={target_env["envname"]}',
@@ -875,7 +877,7 @@ def set_albfront_stage(self, target_env, repository_name):
                 pipelines.CodeBuildStep(
                     id='FrontendImage',
                     build_environment=codebuild.BuildEnvironment(
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                         compute_type=codebuild.ComputeType.LARGE,
                         privileged=True,
                         environment_variables={
@@ -915,7 +917,7 @@ def set_albfront_stage(self, target_env, repository_name):
                 pipelines.CodeBuildStep(
                     id='UserGuideImage',
                     build_environment=codebuild.BuildEnvironment(
-                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                        build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                         compute_type=codebuild.ComputeType.LARGE,
                         privileged=True,
                         environment_variables={
@@ -961,7 +963,7 @@ def set_release_stage(
             pipelines.CodeBuildStep(
                 id='GitRelease',
                 build_environment=codebuild.BuildEnvironment(
-                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_4,
+                    build_image=codebuild.LinuxBuildImage.AMAZON_LINUX_2_5,
                 ),
                 partial_build_spec=codebuild.BuildSpec.from_object(
                     dict(
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e10f021ee..9495269ab 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -32,7 +32,7 @@ services:
     build:
       context: ./backend
       dockerfile: docker/dev/Dockerfile
-    entrypoint: /bin/bash -c "../build/wait-for-it.sh elasticsearch:9200 -t 30 && python3.8 local_graphql_server.py"
+    entrypoint: /bin/bash -c "../build/wait-for-it.sh elasticsearch:9200 -t 30 && python3.9 local_graphql_server.py"
     expose:
       - 5000
     ports:
diff --git a/documentation/userguide/docker/prod/Dockerfile b/documentation/userguide/docker/prod/Dockerfile
index 1a11f64ae..f06ed9436 100644
--- a/documentation/userguide/docker/prod/Dockerfile
+++ b/documentation/userguide/docker/prod/Dockerfile
@@ -1,14 +1,14 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
-ARG NODE_VERSION=16
-ARG PYTHON_VERSION=3.8
+ARG NODE_VERSION=18
+ARG PYTHON_VERSION=3.9
 ARG NGINX_VERSION=1.12
 ARG ENVSUBST_VERSION=v1.1.0
 
-RUN yum -y install shadow-utils wget
-RUN yum -y install openssl-devel bzip2-devel libffi-devel postgresql-devel gcc unzip tar gzip
-RUN amazon-linux-extras install python$PYTHON_VERSION
-RUN amazon-linux-extras install nginx$NGINX_VERSION
+RUN dnf -y install shadow-utils wget
+RUN dnf -y install openssl-devel bzip2-devel libffi-devel postgresql-devel gcc unzip tar gzip
+RUN dnf install python$PYTHON_VERSION
+RUN dnf install nginx$NGINX_VERSION
 
 RUN touch ~/.bashrc
 
diff --git a/frontend/docker/prod/Dockerfile b/frontend/docker/prod/Dockerfile
index 1a4e85ff4..8aa2683b5 100644
--- a/frontend/docker/prod/Dockerfile
+++ b/frontend/docker/prod/Dockerfile
@@ -1,15 +1,15 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
 ARG REACT_APP_STAGE
 ARG DOMAIN
-ARG NODE_VERSION=16
+ARG NODE_VERSION=18
 ARG NGINX_VERSION=1.12
 ARG NVM_VERSION=v0.37.0
 
-RUN yum update -y && \
-    yum install -y tar gzip openssl && \
-    yum clean all -y
-RUN amazon-linux-extras install nginx$NGINX_VERSION
+RUN dnf update -y && \
+    dnf install -y tar gzip openssl && \
+    dnf clean all -y
+RUN dnf install nginx$NGINX_VERSION
 
 RUN touch ~/.bashrc