diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb
index 5702f397b..dd665435a 100644
--- a/app/controllers/ci/cloud_accounts_controller.rb
+++ b/app/controllers/ci/cloud_accounts_controller.rb
@@ -134,6 +134,7 @@ class Ci::CloudAccountsController < Ci::BaseController
         cloud_account.destroy!
       when User::DEVOPS_CERTIFICATION
         cloud_account.ci_user.destroy!
+        Ci::Repo.where(repo_namespace: user.login).delete_all
       end
       user.projects.update_all(open_devops: false)
       user.set_drone_step!(User::DEVOPS_UNINIT)
diff --git a/app/models/ci/user.rb b/app/models/ci/user.rb
index fecf7dccd..197b6a30a 100644
--- a/app/models/ci/user.rb
+++ b/app/models/ci/user.rb
@@ -2,7 +2,7 @@ class Ci::User < Ci::RemoteBase
   self.primary_key = 'user_id'
 
   has_many :repos, foreign_key: "repo_user_id", dependent: :destroy
-  has_many :perms, foreign_key: "perm_user_id", dependent: :destroy
+  has_many :perms, foreign_key: "perm_user_id", dependent: :delete_all
   has_one :ci_cloud_account, class_name: 'Ci::CloudAccount', foreign_key: :ci_user_id
 
 end