diff --git a/buildspec.yml b/codebuild/ci/ci.yml
similarity index 100%
rename from buildspec.yml
rename to codebuild/ci/ci.yml
diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml
index e3c6123cc..412fb3223 100644
--- a/codebuild/ci/release-ci.yml
+++ b/codebuild/ci/release-ci.yml
@@ -8,7 +8,7 @@ env:
     NAMESPACE: com.amazonaws
     PACKAGE: aws-encryption-sdk-java
   parameter-store:
-    ACCOUNT: /CodeBuild/AccountId
+    ACCOUNT: /CodeBuild/AccountIdentity
   secrets-manager:
     GPG_KEY: Maven-GPG-Keys-Credentials:Keyname
     GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase