diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ba2d18b947d10346011cf2ac6c90a358032a526_LmdpdGxhYi1jaS55bWw=..21598db2a3053c86cb4be5032ac1312bb3deec22_LmdpdGxhYi1jaS55bWw= 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@
   # will use images from that registry and not depend on GitLab.com
   BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
-  BUILDER_IMAGE_REVISION: "4.5.0"
+  BUILDER_IMAGE_REVISION: "4.6.0"
   # The registry to pull the assets image from
   ASSET_REGISTRY: "${CI_REGISTRY}"
   ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"
diff --git a/config/patches/python3/custom-openssl.patch b/config/patches/python3/custom-openssl.patch
new file mode 100644
index 0000000000000000000000000000000000000000..21598db2a3053c86cb4be5032ac1312bb3deec22_Y29uZmlnL3BhdGNoZXMvcHl0aG9uMy9jdXN0b20tb3BlbnNzbC5wYXRjaA==
--- /dev/null
+++ b/config/patches/python3/custom-openssl.patch
@@ -0,0 +1,22 @@
+--- Python-3.9.6/Modules/Setup	2021-06-28 08:26:18.000000000 +0000
++++ Python-3.9.6.mine/Modules/Setup	2023-01-16 19:52:08.643849006 +0000
+@@ -207,14 +207,14 @@
+ #_csv _csv.c
+ 
+ # Socket module helper for socket(2)
+-#_socket socketmodule.c
++_socket socketmodule.c
+ 
+ # Socket module helper for SSL support; you must comment out the other
+ # socket line above, and possibly edit the SSL variable:
+-#SSL=/usr/local/ssl
+-#_ssl _ssl.c \
+-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+-#	-L$(SSL)/lib -lssl -lcrypto
++SSL=/usr/local/openssl
++_ssl _ssl.c \
++	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
++	-L$(SSL)/lib -lssl -lcrypto
+ 
+ # The crypt module is now disabled by default because it breaks builds
+ # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
diff --git a/config/software/curl.rb b/config/software/curl.rb
index 2ba2d18b947d10346011cf2ac6c90a358032a526_Y29uZmlnL3NvZnR3YXJlL2N1cmwucmI=..21598db2a3053c86cb4be5032ac1312bb3deec22_Y29uZmlnL3NvZnR3YXJlL2N1cmwucmI= 100644
--- a/config/software/curl.rb
+++ b/config/software/curl.rb
@@ -67,7 +67,8 @@
     "--with-zlib=#{install_dir}/embedded",
     "--without-ca-path",
     "--without-ca-bundle",
-    "--with-ca-fallback"
+    "--with-ca-fallback",
+    "--without-zstd"
   ]
 
   openssl_library_path = "=#{install_dir}/embedded" unless Build::Check.use_system_ssl?
diff --git a/config/software/graphicsmagick.rb b/config/software/graphicsmagick.rb
index 2ba2d18b947d10346011cf2ac6c90a358032a526_Y29uZmlnL3NvZnR3YXJlL2dyYXBoaWNzbWFnaWNrLnJi..21598db2a3053c86cb4be5032ac1312bb3deec22_Y29uZmlnL3NvZnR3YXJlL2dyYXBoaWNzbWFnaWNrLnJi 100644
--- a/config/software/graphicsmagick.rb
+++ b/config/software/graphicsmagick.rb
@@ -60,7 +60,8 @@
     '--with-jpeg=yes',
     '--with-zlib=yes',
     '--with-png=yes',
-    "--with-sysroot=#{install_dir}/embedded"
+    "--with-sysroot=#{install_dir}/embedded",
+    "--without-zstd"
   ]
 
   command configure_command.join(' '), env: env
diff --git a/config/software/libtensorflow_lite.rb b/config/software/libtensorflow_lite.rb
index 2ba2d18b947d10346011cf2ac6c90a358032a526_Y29uZmlnL3NvZnR3YXJlL2xpYnRlbnNvcmZsb3dfbGl0ZS5yYg==..21598db2a3053c86cb4be5032ac1312bb3deec22_Y29uZmlnL3NvZnR3YXJlL2xpYnRlbnNvcmZsb3dfbGl0ZS5yYg== 100644
--- a/config/software/libtensorflow_lite.rb
+++ b/config/software/libtensorflow_lite.rb
@@ -43,7 +43,7 @@
     elsif ohai['platform'] == 'opensuseleap' && ohai['platform_version'].start_with?('15.')
       env['CC'] = "/usr/bin/gcc-8"
       env['CXX'] = "/usr/bin/g++-8"
-    elsif ohai['platform'] == 'amazon' && ohai['platform_version'].start_with?('2')
+    elsif ohai['platform'] == 'amazon' && ohai['platform_version'] == '2'
       env['CC'] = "/usr/bin/gcc10-gcc"
       env['CXX'] = "/usr/bin/gcc10-g++"
     end
diff --git a/config/software/python3.rb b/config/software/python3.rb
index 2ba2d18b947d10346011cf2ac6c90a358032a526_Y29uZmlnL3NvZnR3YXJlL3B5dGhvbjMucmI=..21598db2a3053c86cb4be5032ac1312bb3deec22_Y29uZmlnL3NvZnR3YXJlL3B5dGhvbjMucmI= 100644
--- a/config/software/python3.rb
+++ b/config/software/python3.rb
@@ -62,7 +62,13 @@
     (ohai['platform_family'] =~ /^debian/ && ohai['platform_version'] =~ /^11/) ||
       (ohai['platform'] =~ /^ubuntu/ && ohai['platform_version'] =~ /^22/)
 
+  with_openssl = ''
+  if (ohai['platform'] =~ /^amzn/ || ohai['platform'] =~ /^amazon/) && (ohai['platform_version'] == "2022")
+    patch source: 'custom-openssl.patch'
+    with_openssl = "--with-opensssl=/usr/local/openssl"
+  end
+
   command ['./configure',
            "--prefix=#{install_dir}/embedded",
            '--enable-shared',
            '--with-readline=editline',
@@ -65,7 +71,8 @@
   command ['./configure',
            "--prefix=#{install_dir}/embedded",
            '--enable-shared',
            '--with-readline=editline',
+           with_openssl,
            '--with-dbmliborder='].join(' '), env: env
   make env: env
   make 'install', env: env
diff --git a/files/gitlab-cookbooks/package/libraries/helpers/selinux_distro_helper.rb b/files/gitlab-cookbooks/package/libraries/helpers/selinux_distro_helper.rb
index 2ba2d18b947d10346011cf2ac6c90a358032a526_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9oZWxwZXJzL3NlbGludXhfZGlzdHJvX2hlbHBlci5yYg==..21598db2a3053c86cb4be5032ac1312bb3deec22_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9oZWxwZXJzL3NlbGludXhfZGlzdHJvX2hlbHBlci5yYg== 100644
--- a/files/gitlab-cookbooks/package/libraries/helpers/selinux_distro_helper.rb
+++ b/files/gitlab-cookbooks/package/libraries/helpers/selinux_distro_helper.rb
@@ -3,7 +3,7 @@
   OS_RELEASE_FILE = '/etc/os-release'.freeze
 
   def self.selinux_supported?
-    system_is_rhel7? || system_is_rhel8? || system_is_amazon_linux2?
+    system_is_rhel7? || system_is_rhel8? || system_is_amazon_linux2? || system_is_amazon_linux2022?
   end
 
   def self.system_is_rhel7?
@@ -19,6 +19,11 @@
     platform_family == 'rhel' && %w[amazon amzn].include?(platform&.downcase) && platform_version == '2'
   end
 
+  def self.system_is_amazon_linux2022?
+    # Extra platform check to ensure we don't enable RHEL 2
+    platform_family == 'rhel' && %w[amazon amzn].include?(platform&.downcase) && platform_version == '2022'
+  end
+
   def self.platform_family
     case platform
     when /oracle/, /centos/, /almalinux/, /rocky/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /amzn/
diff --git a/gitlab-ci-config/check-packages.yml b/gitlab-ci-config/check-packages.yml
index 2ba2d18b947d10346011cf2ac6c90a358032a526_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw=..21598db2a3053c86cb4be5032ac1312bb3deec22_Z2l0bGFiLWNpLWNvbmZpZy9jaGVjay1wYWNrYWdlcy55bWw= 100644
--- a/gitlab-ci-config/check-packages.yml
+++ b/gitlab-ci-config/check-packages.yml
@@ -146,6 +146,11 @@
   extends: .yum-install
 AmazonLinux-2-arm64-check:
   image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_arm64:${BUILDER_IMAGE_REVISION}"
+AmazonLinux-2022-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2022:${BUILDER_IMAGE_REVISION}"
+  extends: .yum-install
+AmazonLinux-2022-arm64-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2022_arm64:${BUILDER_IMAGE_REVISION}"
   extends: .yum-install
   tags:
   - docker-arm-builder
diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml
index 2ba2d18b947d10346011cf2ac6c90a358032a526_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..21598db2a3053c86cb4be5032ac1312bb3deec22_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644
--- a/gitlab-ci-config/dev-gitlab-org.yml
+++ b/gitlab-ci-config/dev-gitlab-org.yml
@@ -349,6 +349,14 @@
   extends: .branch_template
   tags:
   - docker-arm-builder
+AmazonLinux-2022-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2022:${BUILDER_IMAGE_REVISION}"
+  extends: .branch_template
+AmazonLinux-2022-arm64-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2022_arm64:${BUILDER_IMAGE_REVISION}"
+  extends: .branch_template
+  tags:
+  - docker-arm-builder
 SLES-12.5-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}"
   extends: .branch_template
@@ -646,6 +654,14 @@
   extends: .tag_template
   tags:
   - docker-arm-builder
+AmazonLinux-2022:
+  image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2022:${BUILDER_IMAGE_REVISION}"
+  extends: .tag_template
+AmazonLinux-2022-arm64:
+  image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2022_arm64:${BUILDER_IMAGE_REVISION}"
+  extends: .tag_template
+  tags:
+  - docker-arm-builder
 SLES-12.5:
   image: "${BUILDER_IMAGE_REGISTRY}/sles_12sp5:${BUILDER_IMAGE_REVISION}"
   extends: .tag_template
@@ -797,6 +813,20 @@
       optional: true
     - job: AmazonLinux-2-arm64-branch
       optional: true
+AmazonLinux-2022-staging:
+  extends: .staging_upload_template
+  needs:
+    - job: AmazonLinux-2022
+      optional: true
+    - job: AmazonLinux-2022-branch
+      optional: true
+AmazonLinux-2022-arm64-staging:
+  extends: .staging_upload_template
+  needs:
+    - job: AmazonLinux-2022-arm64
+      optional: true
+    - job: AmazonLinux-2022-arm64-branch
+      optional: true
 SLES-12.5-staging:
   extends: .staging_upload_template
   needs:
@@ -919,6 +949,14 @@
   extends: .production_release_template
   needs:
     - AmazonLinux-2-arm64
+AmazonLinux-2022-release:
+  extends: .production_release_template
+  needs:
+    - AmazonLinux-2022
+AmazonLinux-2022-arm64-release:
+  extends: .production_release_template
+  needs:
+    - AmazonLinux-2022-arm64
 SLES-12.5-release:
   extends: .production_release_template
   needs:
diff --git a/gitlab-ci-config/gitlab-com.yml b/gitlab-ci-config/gitlab-com.yml
index 2ba2d18b947d10346011cf2ac6c90a358032a526_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA==..21598db2a3053c86cb4be5032ac1312bb3deec22_Z2l0bGFiLWNpLWNvbmZpZy9naXRsYWItY29tLnltbA== 100644
--- a/gitlab-ci-config/gitlab-com.yml
+++ b/gitlab-ci-config/gitlab-com.yml
@@ -402,6 +402,7 @@
 Ubuntu 20.04 knapsack: !reference [.knapsack]
 Ubuntu 22.04 knapsack: !reference [.knapsack]
 AmazonLinux 2 knapsack: !reference [.knapsack]
+AmazonLinux 2022 knapsack: !reference [.knapsack]
 
 build library specs:
   image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/ubuntu_20.04-ruby:${BUILDER_IMAGE_REVISION}"
@@ -484,6 +485,13 @@
   parallel: 6
   needs:
   - AmazonLinux 2 knapsack
+AmazonLinux 2022 specs :
+  image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/amazonlinux_2022-ruby:${BUILDER_IMAGE_REVISION}"
+  extends: .chef_spec_template
+  parallel: 6
+  needs:
+  - AmazonLinux 2022 knapsack
+
 
 update-knapsack:
   extends: .knapsack-state