diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 435f38e..f3939db 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -10,6 +10,7 @@
     # Per repos
     linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
     linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
+    linux_system_repo_mcp_ceph_url: ${_param:linux_system_repo_url}/ceph-${_param:linux_system_repo_mcp_ceph_codename}/
     linux_system_repo_mcp_docker_legacy_url: ${_param:linux_system_repo_url}/docker-1.x/
     linux_system_repo_mcp_docker_url: ${_param:linux_system_repo_url}/docker/
     linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
@@ -35,4 +36,4 @@
     linux_system_repo_mcp_cassandra_version: '21x'
     linux_system_repo_mcp_glusterfs_version_number: "3.8"
     linux_system_repo_mcp_saltstack_version_number: "${_param:salt_version}"
-    linux_system_repo_mcp_ceph_codename: 'luminous'
+    linux_system_repo_mcp_ceph_codename: luminous
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 267b91e..ee8c9ef 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -6,370 +6,6 @@
           name: build-debian-salt-formula-{{name}}-ubuntu-{{dist}}
           jobs:
             - name: aodh
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: apache
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: aptcacher
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: aptly
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: artifactory
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: avinetworks
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: auditd
-              upload_source_packages: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: backupninja
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: baremetal-simulator
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: bind
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: bird
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: cadf
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: calico
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: cassandra
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: ceph
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: chrony
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: collectd
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: debmirror
-              upload_source_package: true
-              upload_to_aptly: true
-              dist: trusty
-            - name: dekapod
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: designate
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: devops-portal
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: docker
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: dogtag
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: elasticsearch
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: etcd
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: fluentbit
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: fluentd
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: freeipa
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: galera
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: gerrit
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: git
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: gitlab
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: glusterfs
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: grafana
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: haproxy
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: heka
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: heketi
-              upload_source_package: true
-              upload_to_aptly: true
-              dist: trusty
-            - name: influxdb
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: iptables
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: ironic
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: isc-dhcp
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: java
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: jenkins
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: keepalived
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: keycloak
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: kibana
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: letsencrypt
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: libvirt
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: linux
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: lldp
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: logrotate
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: maas
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: manila
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: memcached
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: mirascan
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: monasca
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: mongodb
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: murano
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: mysql
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: nfs
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: nginx
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: ntp
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: octavia
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: opencontrail
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: openldap
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: openssh
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: openvpn
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: oslo-templates
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: postgresql
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: powerdns
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: prometheus
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: python
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: rabbitmq
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: reclass
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: redis
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: rsync
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: rsyslog
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: rundeck
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: runtest
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: sahara
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: salt
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: sensu
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: shibboleth
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: sphinx
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: spinnaker
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: statsd
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: telegraf
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: tinyproxy
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: tftpd-hpa
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: xtrabackup
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: zookeeper
-              upload_source_package: false
-              upload_to_aptly: true
-              dist: trusty
-            - name: aodh
               upload_source_package: true
               upload_to_aptly: true
               dist: xenial
diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
index c5350ce..12011ac 100644
--- a/linux/system/repo/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -1,18 +1,32 @@
 classes:
 - system.linux.system.repo.keystorage.mirantis_com
 parameters:
-  _param:
-    linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
-    linux_system_repo_mcp_ceph_codename: luminous
   linux:
     system:
       repo:
         mcp_ceph:
-          source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_ceph_version} ceph-${_param:linux_system_repo_mcp_ceph_codename}"
+          source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_ceph_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mirror_mirantis_key}
           architectures: amd64
-          key: ${_param:linux_system_repo_apt_mirantis_key}
           clean_file: true
           pin:
-          - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
+          - pin: 'release o=Mirantis'
             priority: 1100
             package: '*'
+# Deprecated since 2018.11+
+#parameters:
+#  _param:
+#    linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
+#    linux_system_repo_mcp_ceph_codename: luminous
+#  linux:
+#    system:
+#      repo:
+#        mcp_ceph:
+#          source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_ceph_version} ceph-${_param:linux_system_repo_mcp_ceph_codename}"
+#          architectures: amd64
+#          key: ${_param:linux_system_repo_apt_mirantis_key}
+#          clean_file: true
+#          pin:
+#          - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
+#            priority: 1100
+#            package: '*'