diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bc7e38..fb2ae5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,5 +119,23 @@ defiant:release:
     - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"username\":\"${CI_REGISTRY_USER}\",\"password\":\"${CI_REGISTRY_PASSWORD}\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --context ${DEFIANT_SRC}/src/defiant --dockerfile ${DEFIANT_SRC}/src/defiant/Dockerfile --destination ${DEFIANT_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA} --destination ${DEFIANT_IMAGE}:${CI_COMMIT_REF_SLUG}
   only:
+    changes:
+      - defiant/**/*
+
+defiant:deploy:
+  stage: deploy
+  image: lwolf/helm-kubectl-docker:v1.15.4-v2.14.3
+  script:
+    - mkdir -p ${KUBECONFIG_PARENT}
+    - echo ${K8S_CLUSTER_CONFIG} | base64 -d > ${KUBECONFIG}
+
+    # Deploy using helm chart
+    - cd ${DEFIANT_SRC}/chart
+    - mkdir -p manifests/
+    - helm template ./defiant/ --output-dir manifests/ --name defiant -f ./defiant/values.yaml
+    - kubectl apply --namespace ${DEPLOY_NAMESPACE} -R -f manifests/
+  only:
+    refs:
+      - master
     changes:
       - defiant/**/*
\ No newline at end of file
diff --git a/defiant/chart/defiant/templates/rethinkdb-service.yaml b/defiant/chart/defiant/templates/rethinkdb-service.yaml
index fd2fbc9..85218fb 100644
--- a/defiant/chart/defiant/templates/rethinkdb-service.yaml
+++ b/defiant/chart/defiant/templates/rethinkdb-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}
+  name: rethinkb-{{ .Release.Name }}
   labels:
     app: rethinkdb
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
diff --git a/defiant/src/main_config.yaml b/defiant/src/main_config.yaml
index 10e81ab..58f95d9 100644
--- a/defiant/src/main_config.yaml
+++ b/defiant/src/main_config.yaml
@@ -5,7 +5,7 @@ web:
 
 database:
   # RethinkDB configuration
-  ip: "rethinkdb.public"
+  ip: "rethinkdb-defiant.public"
   port: 28015
   database_name: "battle_myth_theater"