diff --git a/Dockerfile.deb b/Dockerfile.deb
index 176fad35..8de976a0 100644
--- a/Dockerfile.deb
+++ b/Dockerfile.deb
@@ -2,10 +2,15 @@
 FROM debian:bullseye-20230502-slim
 
 LABEL maintainer="Kong Docker Maintainers <docker@konghq.com> (@team-gateway-bot)"
-ARG KONG_VERSION=3.6.1
-ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="97da5168777d5ebc48ff5488d254bee930c52a631203e94c76b3b9dcc83a5d5c"
+################
+ARG KONG_VERSION=3.7.0
+ARG KONG_REPO=37
+ARG KONG_SHA256="3f325e456d884f809b9480100dfb2ae613467fec6864a86e08c44b52a010d73a"
+################
+
+ARG DEBIAN_CODENAME=bullseye
+ENV KONG_VERSION $KONG_VERSION
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX
@@ -19,9 +24,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y curl; \
     if [ "$ASSET" = "remote" ] ; then \
-      CODENAME=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d = -f 2) \
-      && DOWNLOAD_URL="https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-debian-${CODENAME}/pool/all/k/kong/kong_${KONG_VERSION}_amd64.deb" \
-      && curl -fL $DOWNLOAD_URL -o /tmp/kong.deb \
+      DOWNLOAD_URL="https://packages.konghq.com/public/gateway-${KONG_REPO}/deb/debian/pool/${DEBIAN_CODENAME}/main/k/ko/kong_${KONG_VERSION}/kong_${KONG_VERSION}_amd64.deb" \
+      curl -fL $DOWNLOAD_URL -o /tmp/kong.deb \
       && echo "$KONG_SHA256  /tmp/kong.deb" | sha256sum -c -; \
     fi \
     && apt-get update \
diff --git a/Dockerfile.rpm b/Dockerfile.rpm
index 630a4988..180490cd 100644
--- a/Dockerfile.rpm
+++ b/Dockerfile.rpm
@@ -3,9 +3,13 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7@sha256:6910799b75ad41f00891
 
 LABEL maintainer="Kong Docker Maintainers <docker@konghq.com> (@team-gateway-bot)"
 
-ARG KONG_VERSION=3.6.1
-ENV KONG_VERSION $KONG_VERSION
+################
+ARG KONG_VERSION=3.7.0
+ARG KONG_REPO=37
+ARG KONG_SHA256="f9f00e9674c970aa366cd2f4d6e597edb867084a84caee299c444cc973b5d8eb"
+################
 
+ENV KONG_VERSION $KONG_VERSION
 # RedHat required labels
 LABEL name="Kong" \
       vendor="Kong" \
@@ -18,20 +22,22 @@ LABEL name="Kong" \
 # RedHat required LICENSE file approved path
 COPY LICENSE /licenses/
 
-ARG KONG_SHA256="18b9cdcf7d89b4cbaa8d30c1115fea7e8f8ecfb8d4fd7126e3c3ff8c3d9b405c"
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX
 
+ARG REDHAT_MAJOR=8
+
 ARG ASSET=remote
 ARG EE_PORTS
 
 COPY kong.rpm /tmp/kong.rpm
 
+
 # hadolint ignore=DL3015
 RUN set -ex; \
     if [ "$ASSET" = "remote" ] ; then \
-      DOWNLOAD_URL="https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-rhel-8/Packages/k/kong-$KONG_VERSION.rhel8.amd64.rpm" \
+      DOWNLOAD_URL="https://packages.konghq.com/public/gateway-${KONG_REPO}/rpm/el/${REDHAT_MAJOR}/x86_64/kong_${KONG_VERSION}.el${REDHAT_MAJOR}.x86_64.rpm" \
       && curl -fL $DOWNLOAD_URL -o /tmp/kong.rpm \
       && echo "$KONG_SHA256  /tmp/kong.rpm" | sha256sum -c - \
       || exit 1; \