diff --git a/.circleci/config.yml b/.circleci/config.yml
index f30426d6..5325488f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,6 +112,7 @@ references:
     ENVIRONMENT: dev
     HELM_REPOSITORY: codacy-unstable
     CODACY_URL: https://dev.k8s.dev.codacy.org
+    POSTGRES_VERSION: 17
     HELM_INSTALL_EXTRA_FLAGS: --set global.github.app.name=codacy-k8s-selfhosted-dev --set global.github.app.id="${GITHUB_APP_ID_DEV}" --set global.github.app.privateKey="${GITHUB_PRIVATE_KEY_DEV}" --set global.github.clientId=${GITHUB_CLIENTID_DEV} --set global.github.clientSecret=${GITHUB_CLIENTSECRET_DEV} --set global.githubEnterprise.app.name=dev-k8s --set global.githubEnterprise.app.id="${GITHUB_ENTERPRISE_APP_ID_DEV}" --set global.githubEnterprise.app.privateKey="${GITHUB_ENTERPRISE_PRIVATE_KEY_DEV}" --set global.githubEnterprise.clientId=${GITHUB_ENTERPRISE_CLIENTID_DEV} --set global.githubEnterprise.clientSecret=${GITHUB_ENTERPRISE_CLIENTSECRET_DEV} --set global.bitbucket.key="${BITBUCKET_KEY_DEV}" --set global.bitbucket.secret="${BITBUCKET_SECRET_DEV}" --set global.bitbucketEnterprise.consumerKey="${BITBUCKET_ENTERPRISE_CONSUMER_KEY_DEV}" --set global.bitbucketEnterprise.consumerPublicKey="${BITBUCKET_ENTERPRISE_CONSUMER_PUBLIC_KEY_DEV}" --set global.bitbucketEnterprise.consumerPrivateKey="${BITBUCKET_ENTERPRISE_CONSUMER_PRIVATE_KEY_DEV}" --set global.gitlab.clientId="${GITLAB_CLIENTID_DEV}" --set global.gitlab.clientSecret="${GITLAB_CLIENTSECRET_DEV}" --set global.gitlabEnterprise.clientId="${GITLABENTERPRISE_CLIENTID_DEV}" --set global.gitlabEnterprise.clientSecret="${GITLABENTERPRISE_CLIENTSECRET_DEV}"
 
   sandbox_environment: &sandbox_environment
@@ -121,6 +122,7 @@ references:
     NAMESPACE: codacy-sandbox
     ENVIRONMENT: sandbox
     CODACY_URL: https://sandbox.k8s.dev.codacy.org
+    POSTGRES_VERSION: 15
     HELM_INSTALL_EXTRA_FLAGS: --set global.github.app.name=codacy-k8s-selfhosted-sandbox --set global.github.app.id="${GITHUB_APP_ID_SANDBOX}" --set global.github.app.privateKey="${GITHUB_PRIVATE_KEY_SANDBOX}" --set global.github.clientId=${GITHUB_CLIENTID_SANDBOX} --set global.github.clientSecret=${GITHUB_CLIENTSECRET_SANDBOX} --set global.githubEnterprise.app.name=sandbox-k8s --set global.githubEnterprise.app.id="${GITHUB_ENTERPRISE_APP_ID_SANDBOX}" --set global.githubEnterprise.app.privateKey="${GITHUB_ENTERPRISE_PRIVATE_KEY_SANDBOX}" --set global.githubEnterprise.clientId=${GITHUB_ENTERPRISE_CLIENTID_SANDBOX} --set global.githubEnterprise.clientSecret=${GITHUB_ENTERPRISE_CLIENTSECRET_SANDBOX} --set global.bitbucket.key="${BITBUCKET_KEY_SANDBOX}" --set global.bitbucket.secret="${BITBUCKET_SECRET_SANDBOX}" --set global.bitbucketEnterprise.consumerKey="${BITBUCKET_ENTERPRISE_CONSUMER_KEY_SANDBOX}" --set global.bitbucketEnterprise.consumerPublicKey="${BITBUCKET_ENTERPRISE_CONSUMER_PUBLIC_KEY_SANDBOX}" --set global.bitbucketEnterprise.consumerPrivateKey="${BITBUCKET_ENTERPRISE_CONSUMER_PRIVATE_KEY_SANDBOX}" --set global.gitlab.clientId="${GITLAB_CLIENTID_SANDBOX}" --set global.gitlab.clientSecret="${GITLAB_CLIENTSECRET_SANDBOX}" --set global.gitlabEnterprise.clientId="${GITLABENTERPRISE_CLIENTID_SANDBOX}" --set global.gitlabEnterprise.clientSecret="${GITLABENTERPRISE_CLIENTSECRET_SANDBOX}"
 
   release_environment: &release_environment
@@ -131,6 +133,7 @@ references:
     ENVIRONMENT: release
     HELM_REPOSITORY: codacy-incubator
     CODACY_URL: https://release.k8s.dev.codacy.org
+    POSTGRES_VERSION: 16
     HELM_INSTALL_EXTRA_FLAGS: --set global.github.app.name=codacy-k8s-selfhost-release --set global.github.app.id="${GITHUB_APP_ID_RELEASE}" --set global.github.app.privateKey="${GITHUB_PRIVATE_KEY_RELEASE}" --set global.github.clientId=${GITHUB_CLIENTID_RELEASE} --set global.github.clientSecret=${GITHUB_CLIENTSECRET_RELEASE} --set global.githubEnterprise.app.name=release-k8s --set global.githubEnterprise.app.id="${GITHUB_ENTERPRISE_APP_ID_RELEASE}" --set global.githubEnterprise.app.privateKey="${GITHUB_ENTERPRISE_PRIVATE_KEY_RELEASE}" --set global.githubEnterprise.clientId="${GITHUB_ENTERPRISE_CLIENTID_RELEASE}" --set global.githubEnterprise.clientSecret="${GITHUB_ENTERPRISE_CLIENTSECRET_RELEASE}" --set global.bitbucket.key="${BITBUCKET_KEY_RELEASE}" --set global.bitbucket.secret="${BITBUCKET_SECRET_RELEASE}" --set global.bitbucketEnterprise.consumerKey="${BITBUCKET_ENTERPRISE_CONSUMER_KEY_RELEASE}" --set global.bitbucketEnterprise.consumerPublicKey="${BITBUCKET_ENTERPRISE_CONSUMER_PUBLIC_KEY_RELEASE}" --set global.bitbucketEnterprise.consumerPrivateKey="${BITBUCKET_ENTERPRISE_CONSUMER_PRIVATE_KEY_RELEASE}" --set global.gitlab.clientId="${GITLAB_CLIENTID_RELEASE}" --set global.gitlab.clientSecret="${GITLAB_CLIENTSECRET_RELEASE}" --set global.gitlabEnterprise.clientId="${GITLABENTERPRISE_CLIENTID_RELEASE}" --set global.gitlabEnterprise.clientSecret="${GITLABENTERPRISE_CLIENTSECRET_RELEASE}"
 
   ###################################################
diff --git a/.do/db-cluster/Makefile b/.do/db-cluster/Makefile
index fc696f6d..6e243ac9 100644
--- a/.do/db-cluster/Makefile
+++ b/.do/db-cluster/Makefile
@@ -23,6 +23,7 @@ setup_vars:
 	@echo "k8s_cluster_name = \"$(K8S_CLUSTER_NAME)\"" >> $(VARS_FILE)
 	@echo "postgres_instance_type = \"$(INSTANCE_TYPE)\"" >> $(VARS_FILE)
 	@echo "environment = \"$(ENVIRONMENT)\"" >> $(VARS_FILE)
+	@echo "postgres_version = \"$(POSTGRES_VERSION)\"" >> $(VARS_FILE)
 
 .PHONY: start_cluster
 start_cluster: initialize_terrafom terraform_logistics save_outputs replace_db_values