diff --git a/meta-stx-cloud/recipes-extended/registry-token-server/files/registry-token-server-1.0.0.tar.gz b/meta-stx-cloud/recipes-extended/registry-token-server/files/registry-token-server-1.0.0.tar.gz
deleted file mode 100644
index ba20c20..0000000
Binary files a/meta-stx-cloud/recipes-extended/registry-token-server/files/registry-token-server-1.0.0.tar.gz and /dev/null differ
diff --git a/meta-stx-cloud/recipes-extended/registry-token-server/files/registry-token-server.service b/meta-stx-cloud/recipes-extended/registry-token-server/files/registry-token-server.service
deleted file mode 100644
index 477e85d..0000000
--- a/meta-stx-cloud/recipes-extended/registry-token-server/files/registry-token-server.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=v2 Registry token server for Docker
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/docker-distribution/registry/token_server.conf
-ExecStart=/usr/bin/registry-token-server -addr=${REGISTRY_TOKEN_SERVER_ADDR} \
-    -issuer=${REGISTRY_TOKEN_SERVER_ISSUER} \
-    -endpoint=${REGISTRY_TOKEN_SERVER_KS_ENDPOINT} \
-    -tlscert=${REGISTRY_TOKEN_SERVER_TLSCERT} \
-    -tlskey=${REGISTRY_TOKEN_SERVER_TLSKEY} \
-    -realm=${REGISTRY_TOKEN_SERVER_REALM} \
-    -key=${REGISTRY_TOKEN_SERVER_KEY}
-Restart=on-failure
-ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/registry-token-server.pid'
-ExecStopPost=/bin/rm -f /var/run/registry-token-server.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-stx-cloud/recipes-extended/registry-token-server/files/token-server-certificate.pem b/meta-stx-cloud/recipes-extended/registry-token-server/files/token-server-certificate.pem
deleted file mode 100644
index c40df59..0000000
--- a/meta-stx-cloud/recipes-extended/registry-token-server/files/token-server-certificate.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDADCCAegCCQCSevkS4h7LQjANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJY
-WDEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZhdWx0IENvbXBh
-bnkgTHRkMB4XDTE4MDkyMTE0MTYwOFoXDTE5MDkyMTE0MTYwOFowQjELMAkGA1UE
-BhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBD
-b21wYW55IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtCbNJ/
-aPEMkZFEtMKRomOh9NgeOv0jYFY5i23fXghtTgdXu9//H3Huz5/KDJ+XEUp2DZgK
-YQ2UHVR+cqj2sFjCllfAVrzmv9FFR0CQpQxqKcxChefVwsMh6XsqF+GzbqzFOx67
-bT39Xb5+spAmDHctFl3nrmyA1wM6e+OXcktC0chILeN+UEyq5Xeng6/BpVnI2UaY
-J1OpfuUrffddy5t0oeuKGZ/xG2g9sL6GMGBeVslOmLg4CBOwq3knUGoOTFYSjHVx
-rU/p4YgUotIUvb4GBsXqbiI7M2NakItTR6mxfcYiKkxfjadQlptFyGucI84mMYx8
-vO3o6TFLfcTYqZ8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHXZR0U0pyMkYIeO5
-Y/n0H9Onj/PtCJHBbYzMHZGMPlX2IbW+JAeE/0XNIYGHtAtFwlb825Tkg2p7wpa8
-8HmOBqkTyn2ywDdmPqdfjCiMu/Ge6tkLjqkmYWv2l/d4+qEMR4dUh9g8SrrtUdZg
-DP7H22B+0knQ7s04JuiJ27hqi4nPOzdwdJNpz5Przgce8vN1ihk8194pR/uoNrjP
-td3Po+DwmxFKigoKPQCHgQuD63mAFor4vVnht+IkNbB3/lQyXP6Qv7DnWVW9WDBL
-nKxgXhRwyy5mYebYmwA//JX41O/Kdp1Q6oWgv4zSLd8M9FIMtESG8k4gSl0XfUBa
-Y24p0Q==
------END CERTIFICATE-----
diff --git a/meta-stx-cloud/recipes-extended/registry-token-server/files/token-server-private-key.pem b/meta-stx-cloud/recipes-extended/registry-token-server/files/token-server-private-key.pem
deleted file mode 100644
index 4332eb3..0000000
--- a/meta-stx-cloud/recipes-extended/registry-token-server/files/token-server-private-key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAq0Js0n9o8QyRkUS0wpGiY6H02B46/SNgVjmLbd9eCG1OB1e7
-3/8fce7Pn8oMn5cRSnYNmAphDZQdVH5yqPawWMKWV8BWvOa/0UVHQJClDGopzEKF
-59XCwyHpeyoX4bNurMU7HrttPf1dvn6ykCYMdy0WXeeubIDXAzp745dyS0LRyEgt
-435QTKrld6eDr8GlWcjZRpgnU6l+5St9913Lm3Sh64oZn/EbaD2wvoYwYF5WyU6Y
-uDgIE7CreSdQag5MVhKMdXGtT+nhiBSi0hS9vgYGxepuIjszY1qQi1NHqbF9xiIq
-TF+Np1CWm0XIa5wjziYxjHy87ejpMUt9xNipnwIDAQABAoIBAFHCIV+QkdHZ9TiL
-u1vT2NmFvPTb4b9tfxVK3YRziVmujPy2Zqu2CRYEMzyOYd5iaU/J8g1ujwzDdAkd
-YLHHK0MEim+UFBSUeGh4kV6CbzjxCclIzNJz20n6y5MP8ly+o4x5kBLI2YsphPJn
-W+mzMGpIrQ/hhgSosX0KE5EAgQDqOfJSlhZvSgSO5UF9nXvEn7Y9Zc8GK0XQdcwB
-Pr8iFhuhEJmmb4LrCm+3Me/fhLxFjUAOAcLSkFnqfxo2vAuRqk99OOLxFEfPYZB8
-kLkKlQ+PwhkG3pjPg6w/rOmBHqW/ZEpd87972JWeHscXYpb/cLLVmcJbZI/claos
-YOHS7CECgYEA4XKo7GzuqSkLskfaZM2pyNhHbxphqyNfk8GmW5NJnKavpmY8YiXh
-7hNXXf4HCkcHvHMn4JUCHgHVavDNhNnrHNrQAzO3KwuUrrFiBP+yP1tRyQ4BP395
-KIBSUyeEOo9vM7d3yerI8WHboio5gaoqEfeNS1dakZ6ZiOpoP94CIxECgYEAwnfW
-Drdcqkpj794gYDlXH4D279f7+qmq11eI4C0zkZzTFkExl8BGfqpy49kruaTm0e4t
-L1B23TYfKC0ei4BQskyNCHUnl/eic/JHe9gJRd6BAZi2REfV0LI4ytYGgniCu50H
-EJVvTVMXS/+wWcjZr037oV6/WiB9Wzr7Z1oFoa8CgYBlmqdG5lEpK7Z5wqhKheXe
-/pozGFCsMGUC0mOHIfoq/3RqKelM0oXgJhdZ5QKHPzvdUojGTmGF5I2qhJwbI5sy
-her5hnUmkTGRCaCDYDmVFDLnycgGNg0Ek9CGaWjOe5ZCWI1EEuw83T1++Eiyh14u
-esLTEatftXq8megh4IxWAQKBgQCTNfox27ZnJrcuXn0tulpse8jy2RJjt0qfhyET
-asRN52SXxTRQhvoWattcBgsmlmEw69cCqSvB23WMiVNFERaFUpO0olMdpBUzJmXc
-pzal0IDh/4OCfsqqGDALxCbbX3S/p2gwsp617z+EhYMvBG9dWHAywTGjfVLH3Ady
-PmBi+wKBgQCWJS/PmTpyO8LU4MYZk91mJmjHAsPlgi/9n8yEqdmins+X698IsoCr
-s2FN8rol8+UP8c3m9o4kp62ouoby2QzAZw0y3UGWcxOb3ZpoozatKodsoETSLLoL
-T//wVn2Z2MsS9tLOBLZzsZiYlHyYxTUm7UTOdxdjbSLWVdLbCpKEhg==
------END RSA PRIVATE KEY-----
diff --git a/meta-stx-cloud/recipes-extended/registry-token-server/files/token_server.conf b/meta-stx-cloud/recipes-extended/registry-token-server/files/token_server.conf
deleted file mode 100644
index 545c5c6..0000000
--- a/meta-stx-cloud/recipes-extended/registry-token-server/files/token_server.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-
-# This is a puppet managed config file
diff --git a/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_1.0.0.bb b/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_1.0.0.bb
deleted file mode 100644
index 310825e..0000000
--- a/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_1.0.0.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-
-DESCRIPTION = " Token server for use with Docker registry with Openstack Keystone back end"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-
-GO_IMPORT = "registry-token-server"
-
-SRC_URI = "file://registry-token-server-1.0.0.tar.gz \
-           file://registry-token-server.service \
-           file://token_server.conf \
-          "
-
-RDEPENDS_${PN}-dev_append = "systemd"
-
-DEPENDS += "\
-        go-logrus \
-        docker-distribution \
-        go-libtrust \
-        go-patricia \
-        go-mux \
-        go-context \
-        go-phercloud \
-        "
-
-inherit go goarch ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
-
-do_compile() {
-        mkdir -p _build/src
-        ln -sfn ${WORKDIR}/${PN}-${PV} ./_build/src/registry-token-server
-  
-        # Pass the needed cflags/ldflags so that cgo
-        # can find the needed headers files and libraries
-        export GOARCH=${TARGET_GOARCH}
-        export CGO_ENABLED="1"
-        export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-        export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
-        export GOPATH="${WORKDIR}/build/_build:${STAGING_DIR_TARGET}/${prefix}/local/go"
-        cd _build/src/${GO_IMPORT}
-        #oe_runmake registry-token-server
-        export GOROOT=${STAGING_DIR_TARGET}/${prefix}/local/go
-        go build -o ${WORKDIR}/build/bin/registry-token-server registry-token-server
-}
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "registry-token-server.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-do_install() {
-        install -d ${D}/${sbindir}
-        install -m 0755 bin/registry-token-server ${D}/${sbindir}
-        install -d ${D}/${sysconfdir}/registry-token-server/registry
-        install -m 0644 ${WORKDIR}/token_server.conf ${D}/${sysconfdir}/registry-token-server/registry
-
-        if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-            install -d ${D}${systemd_unitdir}/system
-            install -m 0644 ${WORKDIR}/registry-token-server.service ${D}${systemd_unitdir}/system/
-        fi
-}
-
diff --git a/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_git.bb b/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_git.bb
index ffd5bb7..aaab992 100644
--- a/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_git.bb
+++ b/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_git.bb
@@ -6,9 +6,9 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://src/registry-token-server/registry-token-server/src/LICENSE;md5=d2794c0df5b907fdace235a619d80314"
 
 PROTOCOL = "https"
-BRANCH = "r/stx.3.0"
+BRANCH = "r/stx.5.0"
 SRCNAME = "containers"
-SRCREV = "1a4b803e946b488c1f3adb25ab0614d1b0c3c9b8"
+SRCREV = "a8bc70702e5ed7643dfd29195f376651b7948f90"
 PV = "1.0.0+git${SRCPV}"
 S = "${WORKDIR}/git"