diff --git a/defaults/main.yml b/defaults/main.yml
index c11a52fcfddcf6d3545c0d41bf548af7bf1f4312..3f31d8a221ab75fd070801ac5313b9b814a9b342 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,4 @@
 ---
-# defaults file for 3rd_party_repos_satellite
\ No newline at end of file
+# defaults file for 3rd_party_repos_satellite
+foreman_initial_organization: "{{ lookup('env','FOREMAN_INITIAL_ORGANIZATION') }}"
+foreman_initial_location: "{{ lookup('env','FOREMAN_INITIAL_LOCATION') }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index cbcc0a74d7406f938f4c2a5d26af2fb717f4760f..ae4924a9ff52c76ef6b3d6c80426b2d2d8ab4e04 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
-- name: Build Custom Repos
-  import_tasks: repo_create.yml
+- name: move gpg keys to server, create custom repos and sync them
+  include_tasks: repo_create.yml
 
-- name: Add content to activation keys
-  import_tasks: custom_content.yml
+- name: add custom repos to activation keys
+  include_tasks: custom_content.yml
diff --git a/tasks/repo_create.yml b/tasks/repo_create.yml
index 06da2fe9748e0ab6d65a9319e92e1f5ae6f73fbb..e628004d849747a081e14426fa2d2ca2f5398d8e 100644
--- a/tasks/repo_create.yml
+++ b/tasks/repo_create.yml
@@ -1,35 +1,59 @@
 ---
 
+- name: Move epel key
+  copy:
+    src: files/rpm_gpg_key_gitlab
+    dest: /opt/rpm_gpg_key_gitlab
+    owner: root
+    group: root
+
+- name: Move epel key
+  copy:
+    src: files/rpm_gpg_key_epel_7
+    dest: /opt/rpm_gpg_key_epel_7
+    owner: root
+    group: root
+
 - name: Check to see if localhost is running satellite
   shell: command -v hammer >/dev/null 2>&1
   register: is_hammer_exist
 
-- name: gitlab key create
-  command: hammer gpg create --key "{{ rpm_gpg_key_gitlab }}" --organization "{{ org.name }}" --name "gitlab_key"
+- name: epel key create
+  command: hammer gpg create --key "{{ rpm_gpg_key_epel_7 }}" --organization "{{ foreman_initial_organization }}" --name "epel_7_key"
   register: cmd
   failed_when: cmd.rc not in [65,0]
 
-- name: product create gitlabrunner
-  command: hammer product create --gpg-key "gitlab_key" --name "gitlab_product" --description "Gitlabrunner repository" --organization "{{ org.name }}"
+- name: product create EPEL
+  command: hammer product create --gpg-key "epel_7_key" --name "epel_7_product" --description "EPEL 7 Repository" --organization "{{ foreman_initial_organization }}"
   register: cmd
   failed_when: cmd.rc not in [65,0]
 
-- name: repo create gitlab
-  command: hammer repository create --organization "{{ org.name }}" --content-type yum --download-policy "immediate" --gpg-key "gitlab_key" --name "gitlab_repo" --product "gitlab_product" --url "https://packages.gitlab.com/runner/gitlab-runner/el/7/x86_64"
+- name: repo create epel
+  command: hammer repository create --organization "{{ foreman_initial_organization }}" --content-type yum --download-policy "immediate" --gpg-key "epel_7_key" --name "epel_7_repo" --product "epel_7_product" --url "https://dl.fedoraproject.org/pub/epel/7/x86_64/"
   register: cmd
   failed_when: cmd.rc not in [65,0]
 
-- name: epel key create
-  command: hammer gpg create --key "{{ rpm_gpg_key_epel_7 }}" --organization "{{ foreman_initial_organization }}" --name "epel_7_key"
+- name: sync epel repo
+  command: hammer repository synchronize --organization "{{ foreman_initial_organization }}" --product epel_7_product
   register: cmd
   failed_when: cmd.rc not in [65,0]
 
-- name: product create EPEL
-  command: hammer product create --gpg-key "epel_7_key" --name "epel_7_product" --description "EPEL 7 Repository" --organization "{{ foreman_initial_organization }}"
+- name: gitlab key create
+  command: hammer gpg create --key "{{ rpm_gpg_key_gitlab }}" --organization "{{ org.name }}" --name "gitlab_key"
   register: cmd
   failed_when: cmd.rc not in [65,0]
 
-- name: repo create epel
-  command: hammer repository create --organization "{{ foreman_initial_organization }}" --content-type yum --download-policy "immediate" --gpg-key "epel_7_key" --name "epel_7_repo" --product "epel_7_product" --url "https://dl.fedoraproject.org/pub/epel/7/x86_64/"
+- name: product create gitlabrunner
+  command: hammer product create --gpg-key "gitlab_key" --name "gitlab_product" --description "Gitlabrunner repository" --organization "{{ org.name }}"
+  register: cmd
+  failed_when: cmd.rc not in [65,0]
+
+- name: repo create gitlab
+  command: hammer repository create --organization "{{ org.name }}" --content-type yum --download-policy "immediate" --gpg-key "gitlab_key" --name "gitlab_repo" --product "gitlab_product" --url "https://packages.gitlab.com/runner/gitlab-runner/el/7/x86_64"
+  register: cmd
+  failed_when: cmd.rc not in [65,0]
+
+- name: sync epel repo
+  command: hammer repository synchronize --organization "{{ foreman_initial_organization }}" --product gitlab_product
   register: cmd
   failed_when: cmd.rc not in [65,0]