diff --git a/manifests/concourse-manifest/concourse-base.yml b/manifests/concourse-manifest/concourse-base.yml
index 6db8ba73e..920878832 100644
--- a/manifests/concourse-manifest/concourse-base.yml
+++ b/manifests/concourse-manifest/concourse-base.yml
@@ -100,9 +100,14 @@ instance_groups:
         release: concourse
         properties:
           external_url: (( concat "https://" terraform_outputs.concourse_dns_name ))
-          basic_auth_username: admin
-          basic_auth_password: (( grab secrets.concourse_atc_password ))
+          add_local_users:
+            - (( concat "admin:" secrets.concourse_atc_password ))
           auth_duration: (( grab $CONCOURSE_AUTH_DURATION ))
+          main_team:
+            auth:
+              local:
+                users:
+                - admin
           postgresql:
             database: atc
             role:
diff --git a/manifests/concourse-manifest/github_auth/config.yml b/manifests/concourse-manifest/github_auth/config.yml
index 7e86a9e9c..eb59d79e3 100644
--- a/manifests/concourse-manifest/github_auth/config.yml
+++ b/manifests/concourse-manifest/github_auth/config.yml
@@ -8,13 +8,16 @@ instance_groups:
           github_auth:
             client_id: (( grab $GITHUB_CLIENT_ID ))
             client_secret: (( grab $GITHUB_CLIENT_SECRET ))
-            authorize:
-              - user: 46bit
-              - user: alext
-              - user: chrisfarms
-              - user: henrytk
-              - user: keymon
-              - user: LeePorte
-              - user: paroxp
-              - user: richardTowers
-              - user: samcrang
+          main_team:
+            auth:
+              github:
+                users:
+                - 46bit
+                - alext
+                - chrisfarms
+                - henrytk
+                - keymon
+                - LeePorte
+                - paroxp
+                - richardTowers
+                - samcrang
diff --git a/manifests/concourse-manifest/github_auth/dev_ci_additional_users.yml b/manifests/concourse-manifest/github_auth/dev_ci_additional_users.yml
index b92f429ba..6da6296dd 100644
--- a/manifests/concourse-manifest/github_auth/dev_ci_additional_users.yml
+++ b/manifests/concourse-manifest/github_auth/dev_ci_additional_users.yml
@@ -6,10 +6,12 @@ instance_groups:
     jobs:
       - name: atc
         properties:
-          github_auth:
-            authorize:
-              - (( append ))
-              - user: blairboy362
-              - user: jpluscplusm
-              - user: tlwr
-              - user: venusbb
+          main_team:
+            auth:
+              github:
+                users:
+                  - (( append ))
+                  - blairboy362
+                  - jpluscplusm
+                  - tlwr
+                  - venusbb
diff --git a/manifests/concourse-manifest/spec/manifest_generation_spec.rb b/manifests/concourse-manifest/spec/manifest_generation_spec.rb
index 874a6fbf2..81362dd14 100644
--- a/manifests/concourse-manifest/spec/manifest_generation_spec.rb
+++ b/manifests/concourse-manifest/spec/manifest_generation_spec.rb
@@ -35,7 +35,7 @@ def merge_fixtures(fixtures)
 
   it "gets values from secrets" do
     expect(
-      atc_job.fetch("properties").fetch("basic_auth_password")
+      atc_job.fetch("properties").fetch("add_local_users")[0].split(':', 2)[1]
     ).to eq(concourse_secrets_value("concourse_atc_password"))
   end
 end