diff --git a/app/libs/ci/drone/server.rb b/app/libs/ci/drone/server.rb
index 5a699bea6..232f5ab84 100644
--- a/app/libs/ci/drone/server.rb
+++ b/app/libs/ci/drone/server.rb
@@ -19,7 +19,7 @@ class Ci::Drone::Server
     "service docker start; docker rm -f `docker ps -qa`; docker run \
       -v /var/run/docker.sock:/var/run/docker.sock \
       -e DRONE_DATABASE_DRIVER=mysql \
-      -e DRONE_DATABASE_DATASOURCE=#{database_username}:#{database_password}@#{database_host}:3306/drone?parseTime=true \
+      -e DRONE_DATABASE_DATASOURCE=#{database_username}:#{database_password}@#{database_host}:#{database_port}/drone?parseTime=true \
       -e DRONE_GITEA_SERVER=#{gitea_url} \
       -e DRONE_GITEA_CLIENT_ID=#{client_id} \
       -e DRONE_GITEA_CLIENT_SECRET=#{client_secret} \
@@ -51,6 +51,10 @@ class Ci::Drone::Server
       database_config[Rails.env]["ci"]["host"]
     end
 
+    def database_port
+      database_config[Rails.env]["ci"]["port"] || 3306
+    end
+
     def database
       database_config[Rails.env]["ci"]["database"]
     end
diff --git a/app/models/ci/cloud_account.rb b/app/models/ci/cloud_account.rb
index 18ac68fa7..212aab639 100644
--- a/app/models/ci/cloud_account.rb
+++ b/app/models/ci/cloud_account.rb
@@ -1,7 +1,6 @@
 class Ci::CloudAccount < ApplicationRecord
   belongs_to :project
   belongs_to :user
-  belongs_to :repository, foreign_key: :repo_id
 
   def drone_host
     [drone_ip, ":80"].join