diff --git a/lib/tasks/change_site_cert.rake b/lib/tasks/change_site_cert.rake
index e63902e..8004a60 100644
--- a/lib/tasks/change_site_cert.rake
+++ b/lib/tasks/change_site_cert.rake
@@ -58,16 +58,16 @@ namespace :create_site do
                       site_cert = SiteCert.new if site_cert.nil?
                     end
                     if true #site_cert.source_paths.count == 0
-                      site_cert["cert_file"] = File.basename(crt_file_path)
-                      cert_file_store_path = site_cert.cert_file.file.file
+                      cert_file_store_path = "public/#{site_cert.cert_file.store_dir}#{File.basename(crt_file_path)}"
                       crt_file_content = exec_ssh_command_by_sudo_and_see_output(ssh,"cat #{crt_file_path}",false).select{|s| s.present?}.join("\n").strip.split(/(\r\n|\n)/).select{|s| s.present?}.join("\n")
                       FileUtils.mkdir_p(File.dirname(cert_file_store_path)) unless Dir.exist?(File.dirname(cert_file_store_path))
-                      File.open(site_cert.cert_file.file.file,'w+'){|f| f.write(crt_file_content)}
-                      site_cert["private_key"] = File.basename(private_key_path)
-                      private_key_store_path = site_cert.private_key.file.file
+                      File.open(cert_file_store_path,'w+'){|f| f.write(crt_file_content)}
+                      site_cert.cert_file.retrieve_from_store!(File.basename(cert_file_store_path))
+                      private_key_store_path = "public/#{site_cert.cert_file.store_dir}#{File.basename(private_key_path)}"
                       private_key_content = exec_ssh_command_by_sudo_and_see_output(ssh,"cat #{private_key_path}",false).select{|s| s.present?}.join("\n").strip.split(/(\r\n|\n)/).select{|s| s.present?}.join("\n")
                       FileUtils.mkdir_p(File.dirname(private_key_store_path)) unless Dir.exist?(File.dirname(private_key_path))
-                      File.open(site_cert.private_key.file.file,'w+'){|f| f.write(private_key_content)}
+                      File.open(private_key_store_path,'w+'){|f| f.write(private_key_content)}
+                      site_cert.private_key.retrieve_from_store!(File.basename(private_key_path))
                       site_cert.source_paths = [crt_file_path,private_key_path]
                       site_cert.is_certbot = private_key_path.include?("letsencrypt")
                       site_cert.save
diff --git a/lib/tasks/detect_sites.rake b/lib/tasks/detect_sites.rake
index 86249c6..0fd8be6 100644
--- a/lib/tasks/detect_sites.rake
+++ b/lib/tasks/detect_sites.rake
@@ -143,16 +143,16 @@ namespace :create_site do
                     site_cert = SiteCert.new if site_cert.nil?
                   end
                   if true #site_cert.source_paths.count == 0
-                    site_cert["cert_file"] = File.basename(crt_file_path)
-                    cert_file_store_path = site_cert.cert_file.file.file
+                    cert_file_store_path = "public/#{site_cert.cert_file.store_dir}#{File.basename(crt_file_path)}"
                     crt_file_content = exec_ssh_command_by_sudo_and_see_output(ssh,"cat #{crt_file_path}",false).select{|s| s.present?}.join("\n").strip.split(/(\r\n|\n)/).select{|s| s.present?}.join("\n")
                     FileUtils.mkdir_p(File.dirname(cert_file_store_path)) unless Dir.exist?(File.dirname(cert_file_store_path))
                     File.open(cert_file_store_path,'w+'){|f| f.write(crt_file_content)}
-                    site_cert["private_key"] = File.basename(private_key_path)
-                    private_key_store_path = site_cert.private_key.file.file
+                    site_cert.cert_file.retrieve_from_store!(File.basename(cert_file_store_path))
+                    private_key_store_path = "public/#{site_cert.cert_file.store_dir}#{File.basename(private_key_path)}"
                     private_key_content = exec_ssh_command_by_sudo_and_see_output(ssh,"cat #{private_key_path}",false).select{|s| s.present?}.join("\n").strip.split(/(\r\n|\n)/).select{|s| s.present?}.join("\n")
                     FileUtils.mkdir_p(File.dirname(private_key_store_path)) unless Dir.exist?(File.dirname(private_key_store_path))
                     File.open(private_key_store_path,'w+'){|f| f.write(private_key_content)}
+                    site_cert.private_key.retrieve_from_store!(File.basename(private_key_path))
                     site_cert.source_paths = [crt_file_path,private_key_path]
                     site_cert.is_certbot = private_key_path.include?("letsencrypt")
                     site_cert.save