diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
index ac4085528bc1d..12e3cdc1611f7 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
@@ -7,8 +7,9 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/aws-sam-translator/metadata.xml b/dev-python/aws-sam-translator/metadata.xml
index 5c610e171af93..0e57ace7325ff 100644
--- a/dev-python/aws-sam-translator/metadata.xml
+++ b/dev-python/aws-sam-translator/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">awslabs/serverless-application-model</remote-id>
+		<remote-id type="github">aws/serverless-application-model</remote-id>
 		<remote-id type="pypi">aws-sam-translator</remote-id>
 		<bugs-to>https://github.com/awslabs/serverless-application-model/issues</bugs-to>
 	</upstream>