diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 877aadaa..43b5e93d 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -133,6 +133,7 @@ pipeline {
                       withAWSEnv(secret: 'secret/observability-team/ci/service-account/apm-aws-lambda', forceInstallation: true, version: '2.4.10') {
                         dir("${BASE_DIR}/apm-lambda-extension"){
                           cmd(label: 'make publish-in-all-aws-regions', script: 'make publish-in-all-aws-regions')
+                          cmd(label: 'make create-arn-file', script: 'make create-arn-file')
                           stash(includes: "*${SUFFIX_ARN_FILE}", name: "arn-${isArm() ? 'arm' : 'amd'}")
                           stash(includes: "bin/${BRANCH_NAME}-*.zip", name: "dist-${isArm() ? 'arm' : 'amd'}")
                         }
@@ -143,6 +144,8 @@ pipeline {
                 post {
                   always {
                     archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/apm-lambda-extension/.regions")
+                    archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/apm-lambda-extension/*${SUFFIX_ARN_FILE}")
+                    archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/apm-lambda-extension/.aws")
                   }
                 }
               }
diff --git a/.ci/create-arn-table.sh b/.ci/create-arn-table.sh
index 65ccae60..ed1e9951 100755
--- a/.ci/create-arn-table.sh
+++ b/.ci/create-arn-table.sh
@@ -9,14 +9,19 @@ set -eo pipefail
 #	- SUFFIX_ARN_FILE - that's the output file.
 #
 
+ARN_FILE=${ARCHITECTURE}-${SUFFIX_ARN_FILE}
+
 {
 	echo "### ARCH: ${ARCHITECTURE}"
 	echo ''
 	echo '|Region|Arch|ARN|'
 	echo '|------|----|---|'
-	for f in $(ls "${AWS_FOLDER}"); do
-		# TODO: identify what field to be used.
-		echo "|${f}|${ARCHITECTURE}|$(cat $AWS_FOLDER/${f} | jq -r .LayerVersionArn)|"
-	done
-	echo ''
-} > ${ARCHITECTURE}-${SUFFIX_ARN_FILE}
+} > "${ARN_FILE}"
+
+for f in $(ls "${AWS_FOLDER}"); do
+	LAYER_VERSION_ARN=$(jq -r .LayerVersionArn "$AWS_FOLDER/${f}")
+	echo "INFO: create-arn-table ARN(${LAYER_VERSION_ARN}):region(${f}):arch(${ARCHITECTURE})"
+	echo "|${f}|${ARCHITECTURE}|${LAYER_VERSION_ARN}|" >> "${ARN_FILE}"
+done
+
+echo '' >> "${ARN_FILE}"
diff --git a/apm-lambda-extension/Makefile b/apm-lambda-extension/Makefile
index ced74827..278985ec 100644
--- a/apm-lambda-extension/Makefile
+++ b/apm-lambda-extension/Makefile
@@ -54,7 +54,6 @@ publish-in-all-aws-regions: validate-layer-name get-all-aws-regions
 		echo "publish '$(ELASTIC_LAYER_NAME)' in $${AWS_DEFAULT_REGION}"; \
 		AWS_DEFAULT_REGION="$${AWS_DEFAULT_REGION}" ELASTIC_LAYER_NAME=$(ELASTIC_LAYER_NAME) $(MAKE) publish > $(AWS_FOLDER)/$${AWS_DEFAULT_REGION}; \
 	done <.regions
-	$(MAKE) create-arn-file
 
 # Publish the given LAYER in the given AWS region
 publish: validate-layer-name validate-aws-default-region