diff --git a/puppet/zulip/manifests/camo.pp b/puppet/zulip/manifests/camo.pp
index 620b6e4a86..e364528152 100644
--- a/puppet/zulip/manifests/camo.pp
+++ b/puppet/zulip/manifests/camo.pp
@@ -12,7 +12,7 @@ class zulip::camo (String $listen_address = '0.0.0.0') {
 
   zulip::external_dep { 'go-camo':
     version        => $version,
-    url            => "https://github.com/cactus/go-camo/releases/download/v${version}/go-camo-${version}.go1171.linux-amd64.tar.gz",
+    url            => "https://github.com/cactus/go-camo/releases/download/v${version}/go-camo-${version}.go1171.linux-${::architecture}.tar.gz",
     sha256         => '965506e6edb9d974c810519d71e847afb7ca69d1d01ae7d8be6d7a91de669c0c',
     tarball_prefix => "go-camo-${version}/",
     bin            => 'bin/go-camo',
diff --git a/puppet/zulip/manifests/golang.pp b/puppet/zulip/manifests/golang.pp
index afc6625a6e..68351f01e8 100644
--- a/puppet/zulip/manifests/golang.pp
+++ b/puppet/zulip/manifests/golang.pp
@@ -8,7 +8,7 @@ class zulip::golang {
 
   zulip::external_dep { 'golang':
     version        => $version,
-    url            => "https://golang.org/dl/go${version}.linux-amd64.tar.gz",
+    url            => "https://golang.org/dl/go${version}.linux-${::architecture}.tar.gz",
     sha256         => '550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c',
     tarball_prefix => 'go/',
     bin            => 'bin/go',
diff --git a/puppet/zulip/manifests/postgresql_backups.pp b/puppet/zulip/manifests/postgresql_backups.pp
index e773054d24..136c4fa694 100644
--- a/puppet/zulip/manifests/postgresql_backups.pp
+++ b/puppet/zulip/manifests/postgresql_backups.pp
@@ -5,7 +5,7 @@ class zulip::postgresql_backups {
 
   $wal_g_version = '0.2.15'
   zulip::sha256_tarball_to { 'wal-g':
-    url     => "https://github.com/wal-g/wal-g/releases/download/v${wal_g_version}/wal-g.linux-amd64.tar.gz",
+    url     => "https://github.com/wal-g/wal-g/releases/download/v${wal_g_version}/wal-g.linux-${::architecture}.tar.gz",
     sha256  => 'ea33c2341d7bfb203c6948590c29834c013ab06a28c7a2b236a73d906f785c84',
     install => {
       'wal-g' => "/usr/local/bin/wal-g-${wal_g_version}",