diff --git a/ansible/group_vars/sonic/vars b/ansible/group_vars/sonic/vars
index 42857dc9f10..986adcf67be 100644
--- a/ansible/group_vars/sonic/vars
+++ b/ansible/group_vars/sonic/vars
@@ -35,7 +35,8 @@ orchagent_docker_volumes_dict:
 
 orchagent_docker_volumes: "{{ orchagent_docker_volumes_dict.keys() }}"
 
-apt_repo_ip: "10.0.0.5"
+sonic_apt_repo: "http://packages.microsoft.com/repos/sonic-dev/"
+apt_repo: "http://debian-archive.trafficmanager.net/debian/"
 apt_default_release: "*"
 
 # ntp variables
diff --git a/ansible/roles/sonic-common/files/apt/sonic-dev.gpg.key b/ansible/roles/sonic-common/files/apt/sonic-dev.gpg.key
new file mode 100644
index 00000000000..fb9a37901bc
--- /dev/null
+++ b/ansible/roles/sonic-common/files/apt/sonic-dev.gpg.key
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFQ1bTIBCAC7oGfkv/ck0XsLuG8cdcSB2ISqxFAcBvH9BitEtxmpW2uhykKk
+xY4rVD/4Uys1s3PF1/64QfPR+hYcewueOwz0ZAcLyFXXk4McICXaPq3NrLiWYKKX
+UZLnrPzcrGZoW/kHDDp4OmBiDmT1PGvZlpuimwkMCusUzIr7Cbbp2dIy8MERL5tA
+LcgLu3KL6clJ+aTW2jgepI1D7sTepOeGd7eRSb5njKg2M7k/93v/7MipZxiVtyXH
+B74YiK6jSbst5JpuYsLa/Dqryvx7Xq3n53oif892pv3euTduo1fYw8Hgh/OOYdeT
+c9WCj03KA1jCSFURjdrug0kR8BPlfjqtRLXFABEBAAG0JE1TIE9wZW4gVGVjaCA8
+aW50ZXJvcEBtaWNyb3NvZnQuY29tPokBOAQTAQIAIgUCVDVtMgIbAwYLCQgHAwIG
+FQgCCQoLBBYCAwECHgECF4AACgkQsCxG30F6CJO1uAf/cmL68bM8YgF/61hkaY56
+LqrppUTJH/w4fKq47Pf6KfgSLvxfNU6soi2KHYRjIvTRx3tV4vUM5n2plaQg2s8V
+/Epg4FeIRTk75YwiHAzLhLnp5cdUaTvC4j4mwxoB6j9Ty+fXJwQ0MvpDhIZb9vM4
+GXw/fEQHCT4f3gx4nReeqE+FB2wVHleX9+Lpodu98JyJTKJRBRHYLqy6S+/lyp2W
+aBlsI1LOqBcx1uRK24U7duIpbYwIyrx0cafSruqR2GjVdu+imkhHyUn52VbzYhq1
+af0rqYiZ1VOamVOG0By8+hVyNa1MLc1K2uWGs0o5fDe9F5/swbvLHVXI+M50Vs+m
+J7kBDQRUNW0yAQgAu7DkTVj0ZQC4F7bFivAwrdby8gCakTXOl1kcK622hjRJ8nam
+aZeW+eADfLRsTmdUmXgZu1YWS5Gn2ZVngC8SGPUBT071+oRETCz4uNB7IimB9QfP
+++orI6o2vmnVVsq5wWCbEdNU+TCVv1zjrYev5lwckkKpjHt6o8MNoX2DFuQymSyR
+eZKaqhdKmcji4Ke7OIYqwgPjch3wxzE1b5gNOR/iwxWyjjOffZPLr/VhIfIJRs86
+dSXrwjHtEh810SKDLghHM0VAdY34nyC5ZZ61yhts5HtQDFK+9mNpH1mkc4gDBlgG
+266pVvknumK6lPNm/osF/cpjWmEw24ypcQIvOQARAQABiQEfBBgBAgAJBQJUNW0y
+AhsMAAoJELAsRt9BegiTMBUH/0sZ6gZy7mCTSAYT+NSXLFtGC2zNUVL80SWvfgYm
+k9XPVI22MrefZfQ6M01RylyxtWXjRM8UoN8SDKWPpXumzJf831f/7om5zwutaG7b
+tjDPYqRKJSbAIFZu2mN+uLrNQ2SV6XK7FoV0dtcrEX9S7RICb6i19D+70+Oh/qgU
+R04H1jqS29XBzqAlIzdBoA+sYAwbOIJsSL3YyNQcUv3B5+5yR/bo/L8pnUJt6iuL
+nWW+mi7r8gWPHDSrcdYq1TmmlOM7CwZPgWRZzkQPSeZz52Tt7IP47eyGJ09U4PIf
+FtMH1ElL2UgHoA/F9Q88e7LkztaTqE59uXWbIYyuSMJVvRU=
+=sb3d
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/ansible/roles/sonic-common/files/apt/sonic.gpg.key b/ansible/roles/sonic-common/files/apt/sonic.gpg.key
deleted file mode 100644
index 3d9d477d998..00000000000
--- a/ansible/roles/sonic-common/files/apt/sonic.gpg.key
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/ansible/roles/sonic-common/tasks/aptrepo.yml b/ansible/roles/sonic-common/tasks/aptrepo.yml
index 3c134490459..ff035f7bbeb 100644
--- a/ansible/roles/sonic-common/tasks/aptrepo.yml
+++ b/ansible/roles/sonic-common/tasks/aptrepo.yml
@@ -4,13 +4,19 @@
   copy: src=apt/sources.list
         dest=/etc/apt/sources.list
 
-- name: Add apt-key for internal Apt Mirror
-  become: true
-  apt_key: data="{{ lookup('file', 'apt/sonic.gpg.key') }}" state=present
-
 # Adding deb mirror so switch can download packages
 - name: Add internal Apt Package Mirror
-  apt_repository: repo='deb http://{{ apt_repo_ip }}/debian/ jessie main contrib non-free'
+  apt_repository: repo='deb {{ apt_repo }} jessie main contrib non-free'
+       update_cache=yes
+       state=present
+
+- name: Add apt-key for SONiC Specific Apt Repo
+  become: true
+  apt_key: data="{{ lookup('file', 'apt/sonic-dev.gpg.key') }}" state=present
+
+- name: Add SONiC Specific Apt Repo
+  become: true
+  apt_repository: repo='deb [arch=amd64] {{ sonic_apt_repo }} jessie main'
        update_cache=yes
        state=present