diff --git a/ops/argocd/infrastructure/postgresql/application.yaml b/ops/argocd/infrastructure/postgresql/application.yaml
new file mode 100644
index 00000000000..fc714b64edf
--- /dev/null
+++ b/ops/argocd/infrastructure/postgresql/application.yaml
@@ -0,0 +1,29 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: postgresql
+  namespace: argocd
+spec:
+  project: shortlink
+  destination:
+    name: ''
+    namespace: postgresql
+    server: 'https://kubernetes.default.svc'
+  source:
+    path: ops/Helm/addons/store/postgresql
+    repoURL: 'https://github.com/batazor/shortlink'
+    targetRevision: HEAD
+    helm:
+      releaseName: postgresql
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+    retry:
+      limit: 2
+      backoff:
+        duration: 10s
+        maxDuration: 3m0s
+        factor: 2
diff --git a/ops/argocd/infrastructure/redis/application.yaml b/ops/argocd/infrastructure/redis/application.yaml
new file mode 100644
index 00000000000..edcfab6e71d
--- /dev/null
+++ b/ops/argocd/infrastructure/redis/application.yaml
@@ -0,0 +1,29 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: redis
+  namespace: argocd
+spec:
+  project: shortlink
+  destination:
+    name: ''
+    namespace: redis
+    server: 'https://kubernetes.default.svc'
+  source:
+    path: ops/Helm/addons/store/redis
+    repoURL: 'https://github.com/batazor/shortlink'
+    targetRevision: HEAD
+    helm:
+      releaseName: redis
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+    retry:
+      limit: 2
+      backoff:
+        duration: 10s
+        maxDuration: 3m0s
+        factor: 2
diff --git a/ops/gitlab/pipelines/addons/database.yml b/ops/gitlab/pipelines/addons/database.yml
deleted file mode 100644
index b5f40fc405a..00000000000
--- a/ops/gitlab/pipelines/addons/database.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# DATABASE =============================================================================================================
-postgresql:
-  stage: database
-  variables:
-    RELEASE_NAME: postgresql
-    HELM_PATH: ops/Helm/addons/store/postgresql
-    HELM_NAMESPACE: postgresql
-  trigger:
-    include:
-      - local: 'ops/gitlab/pipelines/helm_deploy.yml'
-    strategy: depend
-  needs: []
-  rules:
-    - when: manual
-
-redis:
-  stage: database
-  variables:
-    RELEASE_NAME: redis
-    HELM_PATH: ops/Helm/addons/store/redis
-    HELM_NAMESPACE: redis
-  trigger:
-    include:
-      - local: 'ops/gitlab/pipelines/helm_deploy.yml'
-    strategy: depend
-  needs: []
-  rules:
-    - when: manual
diff --git a/ops/gitlab/pipelines/helm_additional.yml b/ops/gitlab/pipelines/helm_additional.yml
index b7868d81fa4..5d0da3c5d6a 100644
--- a/ops/gitlab/pipelines/helm_additional.yml
+++ b/ops/gitlab/pipelines/helm_additional.yml
@@ -7,5 +7,3 @@ stages:
   - monitoring
   - gateway
   - deploy
-  - database
-  - .post