diff --git a/Gopkg.lock b/Gopkg.lock
index 1c6d4ce95..4c6936acc 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1421,6 +1421,8 @@
     "github.com/RHsyseng/operator-utils/pkg/resource/compare",
     "github.com/RHsyseng/operator-utils/pkg/resource/write",
     "github.com/RHsyseng/operator-utils/pkg/validation",
+    "github.com/blang/semver",
+    "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1",
     "github.com/ghodss/yaml",
     "github.com/go-logr/logr",
     "github.com/go-openapi/spec",
@@ -1434,6 +1436,7 @@
     "github.com/openshift/api/route/v1",
     "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1",
     "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1",
+    "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/version",
     "github.com/operator-framework/operator-sdk/pkg/k8sutil",
     "github.com/operator-framework/operator-sdk/pkg/leader",
     "github.com/operator-framework/operator-sdk/pkg/log/zap",
diff --git a/Makefile b/Makefile
index 9d4519762..1dda761f8 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,10 @@ rhel-scratch:
 rhel-release:
 	./hack/go-build.sh rhel release
 
+.PHONY: csv
+csv:
+	go run ./tools/csv-gen/csv-gen.go
+
 .PHONY: clean
 clean:
 	rm -rf build/_output \
diff --git a/README.md b/README.md
index 3b52c5902..1fb877337 100644
--- a/README.md
+++ b/README.md
@@ -29,14 +29,26 @@ To install this operator on OpenShift 4 for end-to-end testing, make sure you ha
 Push the operator bundle to your quay application repository as follows:
 
 ```bash
-operator-courier push deploy/catalog_resources/courier/bundle_dir/1.2.0 kiegroup kiecloud-operator 1.2.0 "basic XXXXXXXXX"
-# operator-courier push deploy/catalog_resources/courier/bundle_dir/1.1.1 kiegroup kiecloud-operator 1.1.1 "basic XXXXXXXXX"
+REGISTRY_NS=<registry namespace in quay.io>
+operator-courier push deploy/catalog_resources/community ${REGISTRY_NS} kiecloud-operator $(go run getversion.go -operator) "basic XXXXXXXXX"
 ```
 
 If pushing to another quay repository, replace _kiegroup_ with your username or other namespace. Also note that the push command does not overwrite an existing repository, and it needs to be deleted before a new version can be built and uploaded. Once the bundle has been uploaded, create an [Operator Source](https://github.com/operator-framework/community-operators/blob/master/docs/testing-operators.md#linking-the-quay-application-repository-to-your-openshift-40-cluster) to load your operator bundle in OpenShift.
 
 ```bash
-oc create -f deploy/catalog_resources/courier/kiecloud-operatorsource.yaml
+oc create -f - <<EOF
+apiVersion: operators.coreos.com/v1
+kind: OperatorSource
+metadata:
+  name: kiecloud-operators
+  namespace: openshift-marketplace
+spec:
+  type: appregistry
+  endpoint: https://quay.io/cnr
+  registryNamespace: ${REGISTRY_NS}
+  displayName: "KIE Cloud Operators"
+  publisher: "Red Hat"
+EOF
 ```
 
 Remember to replace _registryNamespace_ with your quay namespace. The name, display name and publisher of the operator are the only other attributes that may be modified.
diff --git a/config/7.4.0/common.yaml b/config/7.5.1/common.yaml
similarity index 98%
rename from config/7.4.0/common.yaml
rename to config/7.5.1/common.yaml
index 8d4c6696d..cdd7b8151 100644
--- a/config/7.4.0/common.yaml
+++ b/config/7.5.1/common.yaml
@@ -54,10 +54,10 @@ console:
                     path: /rest/ready
                     port: 8080
                     scheme: HTTP
-                  initialDelaySeconds: 60
+                  initialDelaySeconds: 30
                   timeoutSeconds: 2
-                  periodSeconds: 30
-                  failureThreshold: 6
+                  periodSeconds: 5
+                  failureThreshold: 36
                 ports:
                   - name: jolokia
                     containerPort: 8778
@@ -72,6 +72,10 @@ console:
                     containerPort: 8888
                     protocol: TCP
                 env:
+                  - name: APPLICATION_USERS_PROPERTIES
+                    value: "/opt/kie/data/configuration/application-users.properties"
+                  - name: APPLICATION_ROLES_PROPERTIES
+                    value: "/opt/kie/data/configuration/application-roles.properties"
                   - name: KIE_ADMIN_USER
                     value: "[[.AdminUser]]"
                   - name: KIE_ADMIN_PWD
@@ -662,10 +666,10 @@ servers:
                       path: /services/rest/server/readycheck
                       port: 8080
                       scheme: HTTP
-                    initialDelaySeconds: 60
+                    initialDelaySeconds: 30
                     timeoutSeconds: 2
-                    periodSeconds: 30
-                    failureThreshold: 6
+                    periodSeconds: 5
+                    failureThreshold: 36
                   ports:
                     - name: jolokia
                       containerPort: 8778
diff --git a/config/7.4.0/dbs/external.yaml b/config/7.5.1/dbs/external.yaml
similarity index 100%
rename from config/7.4.0/dbs/external.yaml
rename to config/7.5.1/dbs/external.yaml
diff --git a/config/7.4.0/dbs/h2.yaml b/config/7.5.1/dbs/h2.yaml
similarity index 100%
rename from config/7.4.0/dbs/h2.yaml
rename to config/7.5.1/dbs/h2.yaml
diff --git a/config/7.4.0/dbs/mysql.yaml b/config/7.5.1/dbs/mysql.yaml
similarity index 100%
rename from config/7.4.0/dbs/mysql.yaml
rename to config/7.5.1/dbs/mysql.yaml
diff --git a/config/7.4.0/dbs/postgresql.yaml b/config/7.5.1/dbs/postgresql.yaml
similarity index 100%
rename from config/7.4.0/dbs/postgresql.yaml
rename to config/7.5.1/dbs/postgresql.yaml
diff --git a/config/7.4.0/envs/rhdm-authoring-ha.yaml b/config/7.5.1/envs/rhdm-authoring-ha.yaml
similarity index 56%
rename from config/7.4.0/envs/rhdm-authoring-ha.yaml
rename to config/7.5.1/envs/rhdm-authoring-ha.yaml
index e42b85de5..e8e1f5f0c 100644
--- a/config/7.4.0/envs/rhdm-authoring-ha.yaml
+++ b/config/7.5.1/envs/rhdm-authoring-ha.yaml
@@ -25,10 +25,6 @@ console:
                 volumeMounts:
                   - name: "[[.ApplicationName]]-[[.Console.Name]]-pvol"
                     mountPath: "/opt/kie/data"
-                ports:
-                  - name: git-ssh
-                    containerPort: 8001
-                    protocol: TCP
                 env:
                   - name: APPFORMER_INFINISPAN_SERVICE_NAME
                     value: "[[.ApplicationName]]-datagrid"
@@ -47,178 +43,9 @@ console:
                 persistentVolumeClaim:
                   claimName: "[[.ApplicationName]]-[[.Console.Name]]-claim"
 
-  services:
-    - spec:
-        ports:
-          - name: git-ssh
-            port: 8001
-            targetPort: 8001
-      metadata:
-        name: "[[.ApplicationName]]-[[.Console.Name]]"
-
 # ES/AMQ BEGIN
 others:
-  - roles:
-      - metadata:
-          name: "[[.ApplicationName]]-amq-role"
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-        rules:
-          - apiGroups:
-              - ""
-            resources:
-              - endpoints
-            verbs:
-              - create
-              - delete
-              - deletecollection
-              - get
-              - list
-              - patch
-              - update
-              - watch
-          - apiGroups:
-              - ""
-            resources:
-              - namespaces
-            verbs:
-              - get
-              - list
-
-      - metadata:
-          name: "[[.ApplicationName]]-amq-scaledown-controller-role"
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-        rules:
-          - apiGroups:
-              - apps
-            resources:
-              - statefulsets
-            verbs:
-              - get
-              - list
-              - watch
-          - apiGroups:
-              - ""
-            resources:
-              - pods
-            verbs:
-              - get
-              - list
-              - watch
-              - create
-              - delete
-              - patch
-              - update
-          - apiGroups:
-              - ""
-            resources:
-              - persistentvolumeclaims
-            verbs:
-              - get
-              - list
-              - watch
-              - delete
-          - apiGroups:
-              - ""
-            resources:
-              - events
-            verbs:
-              - get
-              - list
-              - watch
-
-    rolebindings:
-      - metadata:
-          name: "[[.ApplicationName]]-amq-scaledown-controller-openshift-rb"
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-        subjects:
-          - kind: ServiceAccount
-            name: "[[.ApplicationName]]-amq-scaledown-controller-sa"
-        roleRef:
-          kind: Role
-          name: "[[.ApplicationName]]-amq-scaledown-controller-role"
-          apiGroup: rbac.authorization.k8s.io
-
-      - metadata:
-          name: "[[.ApplicationName]]-amq-rb"
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-        subjects:
-          - kind: ServiceAccount
-            name: "[[.ApplicationName]]-amq-sa"
-        roleRef:
-          kind: Role
-          name: "[[.ApplicationName]]-amq-role"
-          apiGroup: rbac.authorization.k8s.io
-
-    serviceaccounts:
-      - metadata:
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-          name: "[[.ApplicationName]]-amq-sa"
-
-      - metadata:
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-          name: "[[.ApplicationName]]-amq-scaledown-controller-sa"
-
-    deploymentConfigs:
-      - metadata:
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-            service: "[[.ApplicationName]]-amq-scaledown-controller"
-          name: "[[.ApplicationName]]-amq-scaledown-controller"
-          annotations:
-            deployment.kubernetes.io/revision: "1"
-            template.alpha.openshift.io/wait-for-ready: "true"
-        spec:
-          replicas: 1
-          selector:
-            deploymentConfig: "[[.ApplicationName]]-amq-scaledown-controller"
-          strategy:
-            rollingParams:
-              maxSurge: 0
-            type: Rolling
-          template:
-            metadata:
-              labels:
-                app: "[[.ApplicationName]]"
-                application: "[[.ApplicationName]]"
-                deploymentConfig: "[[.ApplicationName]]-amq-scaledown-controller"
-              name: "[[.ApplicationName]]-amq-scaledown-controller"
-            spec:
-              serviceAccountName: "[[.ApplicationName]]-amq-scaledown-controller-sa"
-              containers:
-                - args:
-                    - --localOnly
-                    - --v
-                    - "3"
-                  image: "amq-broker-72-scaledown-openshift"
-                  imagePullPolicy: IfNotPresent
-                  name: "[[.ApplicationName]]-amq"
-              terminationGracePeriodSeconds: 30
-          triggers:
-            - imageChangeParams:
-                automatic: true
-                containerNames:
-                  - "[[.ApplicationName]]-amq"
-                from:
-                  kind: ImageStreamTag
-                  namespace: "openshift"
-                  name: "amq-broker-72-scaledown-openshift:0.4"
-              type: ImageChange
-            - type: ConfigChange
-
-    statefulsets:
+  - statefulsets:
       - metadata:
           name: "[[.ApplicationName]]-datagrid"
           labels:
@@ -290,10 +117,11 @@ others:
                     timeoutSeconds: 10
                   resources:
                     limits:
-                      memory: "512Mi"
+                      cpu: "1000m"
+                      memory: "2Gi"
                     requests:
-                      cpu: "0.5"
-                      memory: "512Mi"
+                      cpu: "1000m"
+                      memory: "2Gi"
                   volumeMounts:
                     - mountPath: /opt/datagrid/standalone/data
                       name: srv-data
@@ -327,109 +155,6 @@ others:
       - metadata:
           annotations:
             alpha.image.policy.openshift.io/resolve-names: "*"
-            statefulsets.kubernetes.io/drainer-pod-template: |
-              {
-                "metadata": {
-                  "labels": {
-                    "app": "[[.ApplicationName]]",
-                    "application": "[[.ApplicationName]]"
-                  },
-                  "name": "[[.ApplicationName]]-amq-drainer-pod"
-                },
-                "spec": {
-                  "serviceAccount": "[[.ApplicationName]]-amq-sa",
-                  "serviceAccountName": "[[.ApplicationName]]-amq-sa",
-                  "terminationGracePeriodSeconds": 5,
-                  "containers": [
-                    {
-                      "env": [
-                        {
-                          "name": "AMQ_EXTRA_ARGS",
-                          "value": "--no-autotune"
-                        },
-                        {
-                          "name": "AMQ_USER",
-                          "value": "jmsBrokerUser"
-                        },
-                        {
-                          "name": "AMQ_PASSWORD",
-                          "value": "[[.AMQPassword]]"
-                        },
-                        {
-                          "name": "AMQ_ROLE",
-                          "value": "admin"
-                        },
-                        {
-                          "name": "AMQ_NAME",
-                          "value": "broker"
-                        },
-                        {
-                          "name": "AMQ_TRANSPORTS",
-                          "value": "openwire"
-                        },
-                        {
-                          "name": "AMQ_QUEUES",
-                          "value": ""
-                        },
-                        {
-                          "name": "AMQ_GLOBAL_MAX_SIZE",
-                          "value": "100 gb"
-                        },
-                        {
-                          "name": "AMQ_ALLOW_ANONYMOUS",
-                          "value": ""
-                        },
-                        {
-                          "name": "AMQ_DATA_DIR",
-                          "value": "/opt/amq/data"
-                        },
-                        {
-                          "name": "AMQ_DATA_DIR_LOGGING",
-                          "value": "true"
-                        },
-                        {
-                          "name": "AMQ_CLUSTERED",
-                          "value": "true"
-                        },
-                        {
-                          "name": "AMQ_REPLICAS",
-                          "value": "2"
-                        },
-                        {
-                          "name": "AMQ_CLUSTER_USER",
-                          "value": "jmsBrokerUser"
-                        },
-                        {
-                          "name": "AMQ_CLUSTER_PASSWORD",
-                          "value": "[[.AMQClusterPassword]]"
-                        },
-                        {
-                          "name": "POD_NAMESPACE",
-                          "valueFrom": {
-                            "fieldRef": {
-                              "fieldPath": "metadata.namespace"
-                            }
-                          }
-                        },
-                        {
-                          "name": "OPENSHIFT_DNS_PING_SERVICE_PORT",
-                          "value": "8888"
-                        }
-                      ],
-                      "image": "registry.redhat.io/amq-broker-7/[[$.Constants.BrokerImage]]:[[$.Constants.BrokerImageTag]]",
-                      "name": "[[.ApplicationName]]-amq",
-                      "command": ["/bin/sh", "-c", "echo \"Starting the drainer\" ; /opt/amq/bin/drain.sh; echo \"Drain completed! Exit code $?\""],
-                      "volumeMounts": [
-                        {
-                          "name": "[[.ApplicationName]]-amq-pvol",
-                          "mountPath": "/opt/amq/data"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-          generation: 3
           labels:
             app: "[[.ApplicationName]]"
             application: "[[.ApplicationName]]"
@@ -487,7 +212,7 @@ others:
                         fieldRef:
                           apiVersion: v1
                           fieldPath: metadata.namespace
-                  image: "registry.redhat.io/amq-broker-7/[[$.Constants.BrokerImage]]:[[$.Constants.BrokerImageTag]]"
+                  image: "registry.redhat.io/amq7/[[$.Constants.BrokerImage]]:[[$.Constants.BrokerImageTag]]"
                   imagePullPolicy: IfNotPresent
                   name: broker-amq
                   ports:
diff --git a/config/7.4.0/envs/rhdm-authoring.yaml b/config/7.5.1/envs/rhdm-authoring.yaml
similarity index 81%
rename from config/7.4.0/envs/rhdm-authoring.yaml
rename to config/7.5.1/envs/rhdm-authoring.yaml
index e53276d2f..4a49576af 100644
--- a/config/7.4.0/envs/rhdm-authoring.yaml
+++ b/config/7.5.1/envs/rhdm-authoring.yaml
@@ -26,10 +26,6 @@ console:
                     value: ""
                   - name: OPENSHIFT_DNS_PING_SERVICE_PORT
                     value: ""
-                ports:
-                  - name: git-ssh
-                    containerPort: 8001
-                    protocol: TCP
   persistentVolumeClaims:
     - metadata:
         name: "[[.ApplicationName]]-[[.Console.Name]]-claim"
@@ -40,13 +36,6 @@ console:
           requests:
             storage: 1Gi
   services:
-    - metadata:
-        name: "[[.ApplicationName]]-[[.Console.Name]]"
-      spec:
-        ports:
-          - name: git-ssh
-            port: 8001
-            targetPort: 8001
     - metadata:
         name: "[[.ApplicationName]]-[[.Console.Name]]-ping"
         annotations:
diff --git a/config/7.4.0/envs/rhdm-production-immutable.yaml b/config/7.5.1/envs/rhdm-production-immutable.yaml
similarity index 100%
rename from config/7.4.0/envs/rhdm-production-immutable.yaml
rename to config/7.5.1/envs/rhdm-production-immutable.yaml
diff --git a/config/7.4.0/envs/rhdm-trial.yaml b/config/7.5.1/envs/rhdm-trial.yaml
similarity index 92%
rename from config/7.4.0/envs/rhdm-trial.yaml
rename to config/7.5.1/envs/rhdm-trial.yaml
index d54acf712..40f50cff9 100644
--- a/config/7.4.0/envs/rhdm-trial.yaml
+++ b/config/7.5.1/envs/rhdm-trial.yaml
@@ -7,10 +7,11 @@ console:
           spec:
             containers:
               - name: "[[.ApplicationName]]-[[.Console.Name]]"
-                ports:
-                  - name: git-ssh
-                    containerPort: 8001
-                    protocol: TCP
+                env:
+                  - name: KIE_SERVER_HOST
+                  - name: JGROUPS_PING_PROTOCOL
+                  - name: OPENSHIFT_DNS_PING_SERVICE_NAME
+                  - name: OPENSHIFT_DNS_PING_SERVICE_PORT
             volumes:
               - name: "[[.ApplicationName]]-[[.Console.Name]]-pvol"
                 emptyDir: {}
@@ -20,13 +21,6 @@ console:
         annotations:
           delete: "true"
   services:
-    - metadata:
-        name: "[[.ApplicationName]]-[[.Console.Name]]"
-      spec:
-        ports:
-          - name: git-ssh
-            port: 8001
-            targetPort: 8001
     - metadata:
         name: "[[.ApplicationName]]-[[.Console.Name]]-ping"
         annotations:
diff --git a/config/7.4.0/envs/rhpam-authoring-ha.yaml b/config/7.5.1/envs/rhpam-authoring-ha.yaml
similarity index 56%
rename from config/7.4.0/envs/rhpam-authoring-ha.yaml
rename to config/7.5.1/envs/rhpam-authoring-ha.yaml
index 97dc8cdf9..938b51e46 100644
--- a/config/7.4.0/envs/rhpam-authoring-ha.yaml
+++ b/config/7.5.1/envs/rhpam-authoring-ha.yaml
@@ -25,10 +25,6 @@ console:
                 volumeMounts:
                   - name: "[[.ApplicationName]]-[[.Console.Name]]-pvol"
                     mountPath: "/opt/kie/data"
-                ports:
-                  - name: git-ssh
-                    containerPort: 8001
-                    protocol: TCP
                 env:
                   - name: APPFORMER_INFINISPAN_SERVICE_NAME
                     value: "[[.ApplicationName]]-datagrid"
@@ -47,178 +43,9 @@ console:
                 persistentVolumeClaim:
                   claimName: "[[.ApplicationName]]-[[.Console.Name]]-claim"
 
-  services:
-    - spec:
-        ports:
-          - name: git-ssh
-            port: 8001
-            targetPort: 8001
-      metadata:
-        name: "[[.ApplicationName]]-[[.Console.Name]]"
-
 # ES/AMQ BEGIN
 others:
-  - roles:
-      - metadata:
-          name: "[[.ApplicationName]]-amq-role"
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-        rules:
-          - apiGroups:
-              - ""
-            resources:
-              - endpoints
-            verbs:
-              - create
-              - delete
-              - deletecollection
-              - get
-              - list
-              - patch
-              - update
-              - watch
-          - apiGroups:
-              - ""
-            resources:
-              - namespaces
-            verbs:
-              - get
-              - list
-
-      - metadata:
-          name: "[[.ApplicationName]]-amq-scaledown-controller-role"
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-        rules:
-          - apiGroups:
-              - apps
-            resources:
-              - statefulsets
-            verbs:
-              - get
-              - list
-              - watch
-          - apiGroups:
-              - ""
-            resources:
-              - pods
-            verbs:
-              - get
-              - list
-              - watch
-              - create
-              - delete
-              - patch
-              - update
-          - apiGroups:
-              - ""
-            resources:
-              - persistentvolumeclaims
-            verbs:
-              - get
-              - list
-              - watch
-              - delete
-          - apiGroups:
-              - ""
-            resources:
-              - events
-            verbs:
-              - get
-              - list
-              - watch
-
-    rolebindings:
-      - metadata:
-          name: "[[.ApplicationName]]-amq-scaledown-controller-openshift-rb"
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-        subjects:
-          - kind: ServiceAccount
-            name: "[[.ApplicationName]]-amq-scaledown-controller-sa"
-        roleRef:
-          kind: Role
-          name: "[[.ApplicationName]]-amq-scaledown-controller-role"
-          apiGroup: rbac.authorization.k8s.io
-
-      - metadata:
-          name: "[[.ApplicationName]]-amq-rb"
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-        subjects:
-          - kind: ServiceAccount
-            name: "[[.ApplicationName]]-amq-sa"
-        roleRef:
-          kind: Role
-          name: "[[.ApplicationName]]-amq-role"
-          apiGroup: rbac.authorization.k8s.io
-
-    serviceaccounts:
-      - metadata:
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-          name: "[[.ApplicationName]]-amq-sa"
-
-      - metadata:
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-          name: "[[.ApplicationName]]-amq-scaledown-controller-sa"
-
-    deploymentConfigs:
-      - metadata:
-          labels:
-            app: "[[.ApplicationName]]"
-            application: "[[.ApplicationName]]"
-            service: "[[.ApplicationName]]-amq-scaledown-controller"
-          name: "[[.ApplicationName]]-amq-scaledown-controller"
-          annotations:
-            deployment.kubernetes.io/revision: "1"
-            template.alpha.openshift.io/wait-for-ready: "true"
-        spec:
-          replicas: 1
-          selector:
-            deploymentConfig: "[[.ApplicationName]]-amq-scaledown-controller"
-          strategy:
-            rollingParams:
-              maxSurge: 0
-            type: Rolling
-          template:
-            metadata:
-              labels:
-                app: "[[.ApplicationName]]"
-                application: "[[.ApplicationName]]"
-                deploymentConfig: "[[.ApplicationName]]-amq-scaledown-controller"
-              name: "[[.ApplicationName]]-amq-scaledown-controller"
-            spec:
-              serviceAccountName: "[[.ApplicationName]]-amq-scaledown-controller-sa"
-              containers:
-                - args:
-                    - --localOnly
-                    - --v
-                    - "3"
-                  image: "amq-broker-72-scaledown-openshift"
-                  imagePullPolicy: IfNotPresent
-                  name: "[[.ApplicationName]]-amq"
-              terminationGracePeriodSeconds: 30
-          triggers:
-            - imageChangeParams:
-                automatic: true
-                containerNames:
-                  - "[[.ApplicationName]]-amq"
-                from:
-                  kind: ImageStreamTag
-                  namespace: "openshift"
-                  name: "amq-broker-72-scaledown-openshift:0.4"
-              type: ImageChange
-            - type: ConfigChange
-
-    statefulsets:
+  - statefulsets:
       - metadata:
           name: "[[.ApplicationName]]-datagrid"
           labels:
@@ -290,10 +117,11 @@ others:
                     timeoutSeconds: 10
                   resources:
                     limits:
-                      memory: "512Mi"
+                      cpu: "1000m"
+                      memory: "2Gi"
                     requests:
-                      cpu: "0.5"
-                      memory: "512Mi"
+                      cpu: "1000m"
+                      memory: "2Gi"
                   volumeMounts:
                     - mountPath: /opt/datagrid/standalone/data
                       name: srv-data
@@ -326,110 +154,6 @@ others:
       - metadata:
           annotations:
             alpha.image.policy.openshift.io/resolve-names: "*"
-            statefulsets.kubernetes.io/drainer-pod-template: |
-              {
-                "metadata": {
-                  "labels": {
-                    "app": "[[.ApplicationName]]",
-                    "application": "[[.ApplicationName]]"
-                  },
-                  "name": "[[.ApplicationName]]-amq-drainer-pod"
-                },
-                "spec": {
-                  "serviceAccount": "[[.ApplicationName]]-amq-sa",
-                  "serviceAccountName": "[[.ApplicationName]]-amq-sa",
-                  "terminationGracePeriodSeconds": 5,
-                  "containers": [
-                    {
-                      "env": [
-                        {
-                          "name": "AMQ_EXTRA_ARGS",
-                          "value": "--no-autotune"
-                        },
-                        {
-                          "name": "AMQ_USER",
-                          "value": "jmsBrokerUser"
-                        },
-                        {
-                          "name": "AMQ_PASSWORD",
-                          "value": "[[.AMQPassword]]"
-                        },
-                        {
-                          "name": "AMQ_ROLE",
-                          "value": "admin"
-                        },
-                        {
-                          "name": "AMQ_NAME",
-                          "value": "broker"
-                        },
-                        {
-                          "name": "AMQ_TRANSPORTS",
-                          "value": "openwire"
-                        },
-                        {
-                          "name": "AMQ_QUEUES",
-                          "value": ""
-                        },
-                        {
-                          "name": "AMQ_GLOBAL_MAX_SIZE",
-                          "value": "100 gb"
-                        },
-                        {
-                          "name": "AMQ_ALLOW_ANONYMOUS",
-                          "value": ""
-                        },
-                        {
-                          "name": "AMQ_DATA_DIR",
-                          "value": "/opt/amq/data"
-                        },
-                        {
-                          "name": "AMQ_DATA_DIR_LOGGING",
-                          "value": "true"
-                        },
-                        {
-                          "name": "AMQ_CLUSTERED",
-                          "value": "true"
-                        },
-                        {
-                          "name": "AMQ_REPLICAS",
-                          "value": "2"
-                        },
-                        {
-                          "name": "AMQ_CLUSTER_USER",
-                          "value": "jmsBrokerUser"
-                        },
-                        {
-                          "name": "AMQ_CLUSTER_PASSWORD",
-                          "value": "[[.AMQClusterPassword]]"
-                        },
-                        {
-                          "name": "POD_NAMESPACE",
-                          "valueFrom": {
-                            "fieldRef": {
-                              "fieldPath": "metadata.namespace"
-                            }
-                          }
-                        },
-                        {
-                          "name": "OPENSHIFT_DNS_PING_SERVICE_PORT",
-                          "value": "8888"
-                        }
-                      ],
-                      "image": "registry.redhat.io/amq-broker-7/[[$.Constants.BrokerImage]]:[[$.Constants.BrokerImageTag]]",
-                      "name": "[[.ApplicationName]]-amq",
-                      "command": ["/bin/sh", "-c", "echo \"Starting the drainer\" ; /opt/amq/bin/drain.sh; echo \"Drain completed! Exit code $?\""],
-                      "volumeMounts": [
-                        {
-                          "name": "[[.ApplicationName]]-amq-pvol",
-                          "mountPath": "/opt/amq/data"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-          creationTimestamp: null
-          generation: 3
           labels:
             app: "[[.ApplicationName]]"
             application: "[[.ApplicationName]]"
@@ -488,7 +212,7 @@ others:
                         fieldRef:
                           apiVersion: v1
                           fieldPath: metadata.namespace
-                  image: "registry.redhat.io/amq-broker-7/[[$.Constants.BrokerImage]]:[[$.Constants.BrokerImageTag]]"
+                  image: "registry.redhat.io/amq7/[[$.Constants.BrokerImage]]:[[$.Constants.BrokerImageTag]]"
                   imagePullPolicy: IfNotPresent
                   name: broker-amq
                   ports:
diff --git a/config/7.4.0/envs/rhpam-authoring.yaml b/config/7.5.1/envs/rhpam-authoring.yaml
similarity index 68%
rename from config/7.4.0/envs/rhpam-authoring.yaml
rename to config/7.5.1/envs/rhpam-authoring.yaml
index 896b65c56..4999e5157 100644
--- a/config/7.4.0/envs/rhpam-authoring.yaml
+++ b/config/7.5.1/envs/rhpam-authoring.yaml
@@ -9,10 +9,6 @@ console:
           spec:
             containers:
               - name: "[[.ApplicationName]]-[[.Console.Name]]"
-                ports:
-                  - name: git-ssh
-                    containerPort: 8001
-                    protocol: TCP
   persistentVolumeClaims:
     - metadata:
         name: "[[.ApplicationName]]-[[.Console.Name]]-claim"
@@ -23,13 +19,6 @@ console:
           requests:
             storage: 1Gi
   services:
-    - metadata:
-        name: "[[.ApplicationName]]-[[.Console.Name]]"
-      spec:
-        ports:
-          - name: git-ssh
-            port: 8001
-            targetPort: 8001
     - metadata:
         name: "[[.ApplicationName]]-[[.Console.Name]]-ping"
         annotations:
diff --git a/config/7.4.0/envs/rhpam-production-immutable.yaml b/config/7.5.1/envs/rhpam-production-immutable.yaml
similarity index 100%
rename from config/7.4.0/envs/rhpam-production-immutable.yaml
rename to config/7.5.1/envs/rhpam-production-immutable.yaml
diff --git a/config/7.4.0/envs/rhpam-production.yaml b/config/7.5.1/envs/rhpam-production.yaml
similarity index 100%
rename from config/7.4.0/envs/rhpam-production.yaml
rename to config/7.5.1/envs/rhpam-production.yaml
diff --git a/config/7.4.0/envs/rhpam-trial.yaml b/config/7.5.1/envs/rhpam-trial.yaml
similarity index 92%
rename from config/7.4.0/envs/rhpam-trial.yaml
rename to config/7.5.1/envs/rhpam-trial.yaml
index d54acf712..40f50cff9 100644
--- a/config/7.4.0/envs/rhpam-trial.yaml
+++ b/config/7.5.1/envs/rhpam-trial.yaml
@@ -7,10 +7,11 @@ console:
           spec:
             containers:
               - name: "[[.ApplicationName]]-[[.Console.Name]]"
-                ports:
-                  - name: git-ssh
-                    containerPort: 8001
-                    protocol: TCP
+                env:
+                  - name: KIE_SERVER_HOST
+                  - name: JGROUPS_PING_PROTOCOL
+                  - name: OPENSHIFT_DNS_PING_SERVICE_NAME
+                  - name: OPENSHIFT_DNS_PING_SERVICE_PORT
             volumes:
               - name: "[[.ApplicationName]]-[[.Console.Name]]-pvol"
                 emptyDir: {}
@@ -20,13 +21,6 @@ console:
         annotations:
           delete: "true"
   services:
-    - metadata:
-        name: "[[.ApplicationName]]-[[.Console.Name]]"
-      spec:
-        ports:
-          - name: git-ssh
-            port: 8001
-            targetPort: 8001
     - metadata:
         name: "[[.ApplicationName]]-[[.Console.Name]]-ping"
         annotations:
diff --git a/config/7.4.0/jms/activemq-jms-config.yaml b/config/7.5.1/jms/activemq-jms-config.yaml
similarity index 52%
rename from config/7.4.0/jms/activemq-jms-config.yaml
rename to config/7.5.1/jms/activemq-jms-config.yaml
index d6e8a29fd..fc0e12059 100644
--- a/config/7.4.0/jms/activemq-jms-config.yaml
+++ b/config/7.5.1/jms/activemq-jms-config.yaml
@@ -13,36 +13,40 @@ servers:
               - name: "[[.KieName]]"
                 env:
                   # JMS config BEGIN
+                  - name: KIE_SERVER_EXECUTOR_JMS
+                    value: "[[.Jms.Executor]]"
+                  - name: KIE_SERVER_EXECUTOR_JMS_TRANSACTED
+                    value: "[[.Jms.ExecutorTransacted]]"
                   - name: KIE_SERVER_JMS_QUEUE_REQUEST
-                    value: "[[.Jms.KieServerJmsQueueRequest]]"
+                    value: "[[.Jms.QueueRequest]]"
                   - name: KIE_SERVER_JMS_QUEUE_RESPONSE
-                    value: "[[.Jms.KieServerJmsQueueResponse]]"
+                    value: "[[.Jms.QueueResponse]]"
                   - name: KIE_SERVER_JMS_QUEUE_EXECUTOR
-                    value: "[[.Jms.KieServerJmsQueueExecutor]]"
+                    value: "[[.Jms.QueueExecutor]]"
                   - name: KIE_SERVER_JMS_ENABLE_SIGNAL
-                    value: "[[.Jms.KieServerJmsEnableSignal]]"
-                    # [[ if .Jms.KieServerJmsEnableSignal]]
+                    value: "[[.Jms.EnableSignal]]"
+                    # [[ if .Jms.EnableSignal]]
                   - name: KIE_SERVER_JMS_QUEUE_SIGNAL
-                    value: "[[.Jms.KieServerJmsQueueSignal]]"
+                    value: "[[.Jms.QueueSignal]]"
                     # [[end]]
                   - name: KIE_SERVER_JMS_ENABLE_AUDIT
-                    value: "[[.Jms.KieServerJmsEnableAudit]]"
-                    # [[ if .Jms.KieServerJmsEnableAudit]]
+                    value: "[[.Jms.EnableAudit]]"
+                    # [[ if .Jms.EnableAudit]]
                   - name: KIE_SERVER_JMS_QUEUE_AUDIT
-                    value: "[[.Jms.KieServerJmsQueueAudit]]"
+                    value: "[[.Jms.QueueAudit]]"
                     # [[end]]
                   - name: KIE_SERVER_JMS_AUDIT_TRANSACTED
-                    value: "[[.Jms.KieServerJmsAuditTransacted]]"
+                    value: "[[.Jms.AuditTransacted]]"
                   - name: MQ_SERVICE_PREFIX_MAPPING
                     value: "[[.KieName]]-amq7=AMQ"
                   - name: AMQ_USERNAME
-                    value: "[[.Jms.KieServerJmsUsername]]"
+                    value: "[[.Jms.Username]]"
                   - name: AMQ_PASSWORD
-                    value: "[[.Jms.KieServerJmsPassword]]"
+                    value: "[[.Jms.Password]]"
                   - name: AMQ_PROTOCOL
                     value: "tcp"
                   - name: AMQ_QUEUES
-                    value: "[[.Jms.KieServerJmsAMQQueues]]"
+                    value: "[[.Jms.AMQQueues]]"
                   # JMS config END
     ## KIE server deployment config END
     ## AMQ deployment BEGIN
@@ -51,7 +55,7 @@ servers:
         labels:
           app: "[[$.ApplicationName]]"
           application: "[[$.ApplicationName]]"
-          service: "[[.KieName]]"
+          service: "[[.KieName]]-amq"
         annotations:
           template.alpha.openshift.io/wait-for-ready: "true"
       spec:
@@ -96,22 +100,34 @@ servers:
                   name: console-jolokia
                   protocol: TCP
                 - containerPort: 5672
-                  name: amq-amqp
+                  name: amqp
+                  protocol: TCP
+                - containerPort: 5671
+                  name: amqp-ssl
                   protocol: TCP
                 - containerPort: 1883
-                  name: amq-mqtt
+                  name: mqtt
+                  protocol: TCP
+                - containerPort: 8883
+                  name: mqtt-ssl
                   protocol: TCP
                 - containerPort: 61613
-                  name: amq-stomp
+                  name: stomp
+                  protocol: TCP
+                - containerPort: 61612
+                  name: stomp-ssl
                   protocol: TCP
                 - containerPort: 61616
-                  name: amq-tcp
+                  name: artemis
+                  protocol: TCP
+                - containerPort: 61617
+                  name: amq-tcp-ssl
                   protocol: TCP
               env:
                 - name: AMQ_USER
-                  value: "[[.Jms.KieServerJmsUsername]]"
+                  value: "[[.Jms.Username]]"
                 - name: AMQ_PASSWORD
-                  value: "[[.Jms.KieServerJmsPassword]]"
+                  value: "[[.Jms.Password]]"
                   # maybe turn it in a parameter and defaults to admin if empty?
                 - name: AMQ_ROLE
                   value: "admin"
@@ -120,11 +136,32 @@ servers:
                 - name: AMQ_TRANSPORTS
                   value: "openwire"
                 - name: AMQ_QUEUES
-                  value: "[[.Jms.KieServerJmsAMQQueues]]"
+                  value: "[[.Jms.AMQQueues]]"
                 - name: AMQ_REQUIRE_LOGIN
-                  value: "false"
+                  value: "true"
                 - name: AMQ_ANYCAST_PREFIX
                 - name: AMQ_MULTICAST_PREFIX
+            # [[ if .Jms.AMQEnableSSL]]
+                - name: AMQ_KEYSTORE_TRUSTSTORE_DIR
+                  value: "/etc/amq-secret-volume"
+                - name: AMQ_TRUSTSTORE
+                  value: '[[.Jms.AMQTruststoreName ]]'
+                - name: AMQ_TRUSTSTORE_PASSWORD
+                  value: '[[.Jms.AMQTruststorePassword ]]'
+                - name: AMQ_KEYSTORE
+                  value: '[[.Jms.AMQKeystoreName ]]'
+                - name: AMQ_KEYSTORE_PASSWORD
+                  value: '[[.Jms.AMQKeystorePassword ]]'
+              volumeMounts:
+                - name: broker-secret-volume
+                  mountPath: "/etc/amq-secret-volume"
+                  readOnly: true
+            volumes:
+              - name: broker-secret-volume
+                secret:
+                  secretName: '[[.Jms.AMQSecretName ]]'
+           # [[end]]
+
     ## AMQ deployment END
     services:
       - spec:
@@ -144,7 +181,7 @@ servers:
             description: "The broker's console and Jolokia port."
       - spec:
           ports:
-            - name: "amp-amqp"
+            - name: "amq-amqp"
               port: 5672
               targetPort: 5672
           selector:
@@ -157,6 +194,21 @@ servers:
             service: "[[.KieName]]-amq"
           annotations:
             description: "The broker's AMQP port."
+      - spec:
+          ports:
+            - name: "amq-amqp-ssl"
+              port: 5671
+              targetPort: 5671
+          selector:
+            deploymentConfig: "[[.KieName]]-amq"
+        metadata:
+          name: "[[.KieName]]-amq-amqp-ssl"
+          labels:
+            app: "[[$.ApplicationName]]"
+            application: "[[$.ApplicationName]]"
+            service: "[[.KieName]]-amq"
+          annotations:
+            description: "The broker's AMQP SSL port."
       - spec:
           ports:
             - name: "amq-mqtt"
@@ -174,7 +226,22 @@ servers:
             description: "The broker's MQTT port."
       - spec:
           ports:
-            - name: "amp-stomp"
+            - name: "amq-mqtt-ssl"
+              port: 8883
+              targetPort: 8883
+          selector:
+            deploymentConfig: "[[.KieName]]-amq"
+        metadata:
+          name: "[[.KieName]]-amq-mqtt-ssl"
+          labels:
+            app: "[[$.ApplicationName]]"
+            application: "[[$.ApplicationName]]"
+            service: "[[.KieName]]-amq"
+          annotations:
+            description: "The broker's MQTT SSL port."
+      - spec:
+          ports:
+            - name: "amq-stomp"
               port: 61613
               targetPort: 61613
           selector:
@@ -187,6 +254,21 @@ servers:
             service: "[[.KieName]]-amq"
           annotations:
             description: "The broker's STOMP port."
+      - spec:
+          ports:
+            - name: "amq-stomp-ssl"
+              port: 61612
+              targetPort: 61612
+          selector:
+            deploymentConfig: "[[.KieName]]-amq"
+        metadata:
+          name: "[[.KieName]]-amq-stomp-ssl"
+          labels:
+            app: "[[$.ApplicationName]]"
+            application: "[[$.ApplicationName]]"
+            service: "[[.KieName]]-amq"
+          annotations:
+            description: "The broker's STOMP SSL port."
       - spec:
           ports:
             - name: "amq-tcp"
@@ -205,11 +287,33 @@ servers:
             service.alpha.openshift.io/dependencies: '[{"name": "[[.KieName]]-amq-amqp",
                 "kind": "Service"},{"name": "[[.KieName]]-amq-mqtt", "kind": "Service"},{"name":
                 "[[.KieName]]-amq-stomp", "kind": "Service"}]'
-
+      - spec:
+          ports:
+            - name: "amq-tcp-ssl"
+              port: 61617
+              targetPort: 61617
+          selector:
+            deploymentConfig: "[[.KieName]]-amq"
+        metadata:
+          name: "[[.KieName]]-amq-tcp-ssl"
+          labels:
+            app: "[[$.ApplicationName]]"
+            application: "[[$.ApplicationName]]"
+            service: "[[.KieName]]-amq"
+          annotations:
+            description: The broker's OpenWire SSL port.
+            service.alpha.openshift.io/dependencies: '[{"name": "[[.KieName]]-amq-tcp", "kind": "Service"},{"name":
+                "[[.KieName]]-amq-amqp", "kind": "Service"},{"name":
+                "[[.KieName]]-amq-mqtt", "kind": "Service"},{"name":
+                "[[.KieName]]-amq-stomp", "kind": "Service"},{"name":
+                "[[.KieName]]-amq-amqp-ssl", "kind": "Service"},{"name":
+                "[[.KieName]]-amq-mqtt-ssl", "kind": "Service"},{"name":
+                "[[.KieName]]-amq-stomp-ssl", "kind": "Service"}]'
     routes:
+      # [[ if .Jms.AMQEnableSSL]]
       - id: "[[.KieName]]-amq-jolokia-console"
         metadata:
-          name: amq-jolokia-console
+          name: "amq-jolokia-console"
           labels:
             app: "[[$.ApplicationName]]"
             application: "[[$.ApplicationName]]"
@@ -220,6 +324,40 @@ servers:
           to:
             kind: "Service"
             name: "[[.KieName]]-amq-jolokia"
+          tls:
+            termination: passthrough
+
+      - id: "[[.KieName]]-amq-tcp-ssl"
+        metadata:
+          name: "amq-tcp-ssl"
+          labels:
+            app: "[[$.ApplicationName]]"
+            application: "[[$.ApplicationName]]"
+            service: "[[.KieName]]-amq"
+          annotations:
+            description: "Route for AMQ Jolokia Service"
+        spec:
+          to:
+            kind: "Service"
+            name: "[[.KieName]]-amq-tcp-ssl"
+          tls:
+            termination: passthrough
+      # [[else]]
+      - id: "[[.KieName]]-amq-jolokia-console"
+        metadata:
+          name: "amq-jolokia-console"
+          labels:
+            app: "[[$.ApplicationName]]"
+            application: "[[$.ApplicationName]]"
+            service: "[[.KieName]]-amq"
+          annotations:
+            description: "Route for AMQ Jolokia Service"
+        spec:
+          to:
+            kind: "Service"
+            name: "[[.KieName]]-amq-jolokia"
+      # [[end]]
+
 #[[end]]
 ## RANGE ends
 ## KIE Servers END
diff --git a/deploy/catalog_resources/community/1.1.0/kieapp.v1.crd.yaml b/deploy/catalog_resources/community/1.1.0/kieapp.v1.crd.yaml
new file mode 120000
index 000000000..fe8f9d21d
--- /dev/null
+++ b/deploy/catalog_resources/community/1.1.0/kieapp.v1.crd.yaml
@@ -0,0 +1 @@
+../../../crds/kieapp.v1.crd.yaml
\ No newline at end of file
diff --git a/deploy/catalog_resources/community/1.1.1/kieapp.v1.crd.yaml b/deploy/catalog_resources/community/1.1.1/kieapp.v1.crd.yaml
new file mode 120000
index 000000000..fe8f9d21d
--- /dev/null
+++ b/deploy/catalog_resources/community/1.1.1/kieapp.v1.crd.yaml
@@ -0,0 +1 @@
+../../../crds/kieapp.v1.crd.yaml
\ No newline at end of file
diff --git a/deploy/catalog_resources/community/1.2.1/kieapp.crd.yaml b/deploy/catalog_resources/community/1.2.1/kieapp.crd.yaml
new file mode 120000
index 000000000..067f0ca30
--- /dev/null
+++ b/deploy/catalog_resources/community/1.2.1/kieapp.crd.yaml
@@ -0,0 +1 @@
+../../../crds/kieapp.crd.yaml
\ No newline at end of file
diff --git a/deploy/catalog_resources/community/1.2.1/kiecloud-operator.1.2.1.clusterserviceversion.yaml b/deploy/catalog_resources/community/1.2.1/kiecloud-operator.1.2.1.clusterserviceversion.yaml
new file mode 100644
index 000000000..b6d5f1c4a
--- /dev/null
+++ b/deploy/catalog_resources/community/1.2.1/kiecloud-operator.1.2.1.clusterserviceversion.yaml
@@ -0,0 +1,228 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: '[{"apiVersion":"app.kiegroup.org/v2","kind":"KieApp","metadata":{"name":"rhpam-trial"},"spec":{"environment":"rhpam-trial"}}]'
+    capabilities: Seamless Upgrades
+    categories: Integration & Delivery
+    certified: "false"
+    containerImage: quay.io/kiegroup/kie-cloud-operator:1.2.1
+    createdAt: "2019-10-31 13:29:39"
+    description: Kie Cloud Operator for deployment and management of RHPAM/RHDM environments.
+    repository: https://github.com/kiegroup/kie-cloud-operator
+    support: Red Hat, Inc.
+    tectonic-visibility: ocs
+  labels:
+    operator-kiecloud: "true"
+  name: kiecloud-operator.1.2.1
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions:
+    owned:
+    - description: A project prescription running an RHPAM/RHDM environment.
+      displayName: KieApp
+      kind: KieApp
+      name: kieapps.app.kiegroup.org
+      resources:
+      - kind: DeploymentConfig
+        name: ""
+        version: apps.openshift.io/v1
+      - kind: StatefulSet
+        name: ""
+        version: apps/v1
+      - kind: Role
+        name: ""
+        version: rbac.authorization.k8s.io/v1
+      - kind: RoleBinding
+        name: ""
+        version: rbac.authorization.k8s.io/v1
+      - kind: Route
+        name: ""
+        version: route.openshift.io/v1
+      - kind: BuildConfig
+        name: ""
+        version: build.openshift.io/v1
+      - kind: ImageStream
+        name: ""
+        version: image.openshift.io/v1
+      - kind: Secret
+        name: ""
+        version: v1
+      - kind: PersistentVolumeClaim
+        name: ""
+        version: v1
+      - kind: ServiceAccount
+        name: ""
+        version: v1
+      - kind: Service
+        name: ""
+        version: v1
+      specDescriptors:
+      - description: Set true to enable automatic micro version product upgrades,
+          it is disabled by default.
+        displayName: Enable Upgrades
+        path: upgrades.enabled
+        value: false
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Set true to enable automatic minor product version upgrades,
+          it is disabled by default. Requires spec.upgrades.enabled to be true.
+        displayName: Include minor version upgrades
+        path: upgrades.minor
+        value: false
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Environment deployed.
+        displayName: Environment
+        path: environment
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:label
+      - description: Product version installed.
+        displayName: Version
+        path: version
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:label
+      statusDescriptors:
+      - description: Deployments for the KieApp environment.
+        displayName: Deployments
+        path: deployments
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:podStatuses
+      - description: Current phase.
+        displayName: Status
+        path: phase
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:label
+      - description: The address for accessing Business Central, if it is deployed.
+        displayName: Business/Decision Central URL
+        path: consoleHost
+        x-descriptors:
+        - urn:alm:descriptor:org.w3:link
+      version: v2
+  description: Kie Cloud Operator for deployment and management of RHPAM/RHDM environments.
+  displayName: Kie Cloud
+  icon:
+  - base64data: PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2Q3MWUwMH0uY2xzLTJ7ZmlsbDojYzIxYTAwfS5jbHMtM3tmaWxsOiNmZmZ9LmNscy00e2ZpbGw6I2VhZWFlYX0uY2xzLTV7ZmlsbDojYjdiN2I3fS5jbHMtNntmaWxsOiNjZGNkY2R9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvZ288L3RpdGxlPjxnIGlkPSJMYXllcl8xIiBkYXRhLW5hbWU9IkxheWVyIDEiPjxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iNTAiIGN5PSI1MCIgcj0iNTAiIHRyYW5zZm9ybT0icm90YXRlKC00NSA1MCA1MCkiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik04NS4zNiAxNC42NGE1MCA1MCAwIDAgMS03MC43MiA3MC43MnoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik02NS43NiAzNC4yOEwxNS42IDQzLjE1djEuMTNhLjM0LjM0IDAgMCAwIC4zLjM0YzEuNDcuMTcgNy45MyAyLjExIDggMjMuNDlhLjQ2LjQ2IDAgMCAwIC4zNS40NGwyLjU5LjU3cy0xLjIxLTI1LjU0IDguNzctMjcuMDYgMTEuMiAyNy4yNyAxMS4zMyAzMS4xYS41NC41NCAwIDAgMCAuNDMuNTFsMy41MS43OHMuMDYtMzQuNTQgMTQuOTItMzYuODJ2LTMuMzV6Ii8+PHBhdGggY2xhc3M9ImNscy00IiBkPSJNNjUuMzUgMjcuNTZMMTYuMTggMzguNDJhLjc1Ljc1IDAgMCAwLS41OS43M3Y0bDUwLjE3LTguODd2LTYuNzZhMS42OCAxLjY4IDAgMCAwLS40MS4wNHoiLz48cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0zNS42MSA0Mi4wNWMtNC42MS43LTYuODMgNi41NC03Ljg5IDEyLjYxbDEzLjY1LTEuMzNjMC0uMTcuMDktLjM0LjEzLS41MXMuMTQtLjUzLjIxLS44bC4yLS42OHEuMTItLjQuMjUtLjhsLjItLjYyYy4xMi0uMzYuMjUtLjcxLjM5LTEuMDZsLjEyLS4zMmMtMS42NC00LjE3LTMuOTgtNi45OS03LjI2LTYuNDl6TTgyLjIzIDMxLjE5bC0xNi0zLjYyYTEuOSAxLjkgMCAwIDAtLjQyIDB2Ni43NmwxNy4wNiAyLjgzdi01LjIzYS43Ni43NiAwIDAgMC0uNjQtLjc0ek01My40MyA1My42MmwxOC40MS0xLjEzYzIuMS02LjA1IDUuNTEtMTEuNzUgMTEtMTIuOGwtMTctMi4wOGMtNi42OCAxLjEyLTEwLjM2IDguMjktMTIuNDEgMTYuMDF6Ii8+PHBhdGggY2xhc3M9ImNscy02IiBkPSJNNDEuNzEgNTJsLjEzLS40NS0uMTMuNDZ6TTQxLjkxIDUxLjM0bC0uMDYuMjIuMDctLjIzek0yNy43MiA1NC42NmE2OC4yNiA2OC4yNiAwIDAgMC0uOTMgMTJ2Mi40MkwzOSA2Ni4xYTEuMDYgMS4wNiAwIDAgMCAuODEtMSA1OC43MiA1OC43MiAwIDAgMSAxLjY5LTEyLjI2YzAgLjE2LS4wOS4zMy0uMTMuNDl6TTY1Ljc4IDM0LjI4bC4wMSAzLjM0IDE3LjAzIDIuMDd2LTIuNThsLTE3LjA0LTIuODN6TTUwLjg3IDc0LjQ0TDY4IDY4LjY4YS45Mi45MiAwIDAgMCAuNjMtLjc5IDcyLjQ2IDcyLjQ2IDAgMCAxIDMuMTgtMTUuNGwtMTguMzggMS4xM2E5MC45MSA5MC45MSAwIDAgMC0yLjU2IDIwLjgyek01My40MyA1My42MnoiLz48L2c+PC9zdmc+
+    mediatype: image/svg+xml
+  install:
+    spec:
+      deployments:
+      - name: kie-cloud-operator
+        spec:
+          replicas: 1
+          selector:
+            matchLabels:
+              name: kie-cloud-operator
+          strategy:
+            rollingUpdate:
+              maxSurge: 1
+              maxUnavailable: 1
+            type: RollingUpdate
+          template:
+            metadata:
+              labels:
+                name: kie-cloud-operator
+            spec:
+              containers:
+              - command:
+                - kie-cloud-operator
+                env:
+                - name: OPERATOR_NAME
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.labels['name']
+                - name: POD_NAME
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.name
+                - name: WATCH_NAMESPACE
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.namespace
+                - name: OPERATOR_UI
+                  value: "true"
+                - name: DEBUG
+                  value: "false"
+                image: quay.io/kiegroup/kie-cloud-operator:1.2.1
+                imagePullPolicy: Always
+                name: kie-cloud-operator
+                resources: {}
+              serviceAccountName: kie-cloud-operator
+      permissions:
+      - rules:
+        - apiGroups:
+          - ""
+          - apps
+          - apps.openshift.io
+          - rbac.authorization.k8s.io
+          - route.openshift.io
+          - build.openshift.io
+          - image.openshift.io
+          - app.kiegroup.org
+          resources:
+          - '*'
+          verbs:
+          - '*'
+        - apiGroups:
+          - monitoring.coreos.com
+          resources:
+          - servicemonitors
+          verbs:
+          - get
+          - create
+        - apiGroups:
+          - operators.coreos.com
+          resources:
+          - clusterserviceversions
+          verbs:
+          - '*'
+        - apiGroups:
+          - apps
+          resourceNames:
+          - kie-cloud-operator
+          resources:
+          - deployments/finalizers
+          verbs:
+          - update
+        serviceAccountName: kie-cloud-operator
+    strategy: deployment
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: false
+    type: AllNamespaces
+  keywords:
+  - kieapp
+  - pam
+  - decision
+  - kie
+  - cloud
+  - bpm
+  - process
+  - automation
+  - operator
+  labels:
+    alm-owner-kiecloud: kiecloud-operator
+    operated-by: kiecloud-operator.1.2.1
+  links:
+  - name: Product Page
+    url: https://access.redhat.com/products/red-hat-process-automation-manager
+  - name: Documentation
+    url: https://access.redhat.com/documentation/en-us/red_hat_process_automation_manager/7.5/#category-deploying-red-hat-process-automation-manager-on-openshift
+  maintainers:
+  - email: bsig-cloud@redhat.com
+    name: Red Hat, Inc.
+  maturity: stable
+  provider:
+    name: Red Hat, Inc.
+  replaces: kiecloud-operator.1.2.0
+  selector:
+    matchLabels:
+      alm-owner-kiecloud: kiecloud-operator
+      operated-by: kiecloud-operator.1.2.1
+  version: 1.2.1
diff --git a/deploy/catalog_resources/community/kiecloud.package.yaml b/deploy/catalog_resources/community/kiecloud.package.yaml
index faa36b11d..ef90a3dad 100644
--- a/deploy/catalog_resources/community/kiecloud.package.yaml
+++ b/deploy/catalog_resources/community/kiecloud.package.yaml
@@ -1,5 +1,5 @@
-#! package-manifest: deploy/catalog_resources/community/1.2.0/kiecloud-operator.1.2.0.clusterserviceversion.yaml
-packageName: kiecloud-operator
+#! package-manifest: deploy/catalog_resources/community/1.2.1/kiecloud-operator.1.2.1.clusterserviceversion.yaml
 channels:
-  - name: stable
-    currentCSV: kiecloud-operator.1.2.0
+- currentCSV: kiecloud-operator.1.2.1
+  name: stable
+packageName: kiecloud-operator
diff --git a/deploy/catalog_resources/redhat/1.1.0/kieapp.v1.crd.yaml b/deploy/catalog_resources/redhat/1.1.0/kieapp.v1.crd.yaml
new file mode 120000
index 000000000..fe8f9d21d
--- /dev/null
+++ b/deploy/catalog_resources/redhat/1.1.0/kieapp.v1.crd.yaml
@@ -0,0 +1 @@
+../../../crds/kieapp.v1.crd.yaml
\ No newline at end of file
diff --git a/deploy/catalog_resources/redhat/1.1.1/kieapp.v1.crd.yaml b/deploy/catalog_resources/redhat/1.1.1/kieapp.v1.crd.yaml
new file mode 120000
index 000000000..fe8f9d21d
--- /dev/null
+++ b/deploy/catalog_resources/redhat/1.1.1/kieapp.v1.crd.yaml
@@ -0,0 +1 @@
+../../../crds/kieapp.v1.crd.yaml
\ No newline at end of file
diff --git a/deploy/catalog_resources/redhat/1.2.1/businessautomation-operator.1.2.1.clusterserviceversion.yaml b/deploy/catalog_resources/redhat/1.2.1/businessautomation-operator.1.2.1.clusterserviceversion.yaml
new file mode 100644
index 000000000..c380a42f8
--- /dev/null
+++ b/deploy/catalog_resources/redhat/1.2.1/businessautomation-operator.1.2.1.clusterserviceversion.yaml
@@ -0,0 +1,230 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: '[{"apiVersion":"app.kiegroup.org/v2","kind":"KieApp","metadata":{"name":"rhpam-trial"},"spec":{"environment":"rhpam-trial"}}]'
+    capabilities: Seamless Upgrades
+    categories: Integration & Delivery
+    certified: "true"
+    containerImage: registry.redhat.io/rhpam-7/rhpam-rhel8-operator:7.5.1
+    createdAt: "2019-10-31 13:29:39"
+    description: Business Automation Operator for deployment and management of RHPAM/RHDM
+      environments.
+    repository: https://github.com/kiegroup/kie-cloud-operator
+    support: Red Hat, Inc.
+    tectonic-visibility: ocs
+  labels:
+    operator-businessautomation: "true"
+  name: businessautomation-operator.1.2.1
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions:
+    owned:
+    - description: A project prescription running an RHPAM/RHDM environment.
+      displayName: KieApp
+      kind: KieApp
+      name: kieapps.app.kiegroup.org
+      resources:
+      - kind: DeploymentConfig
+        name: ""
+        version: apps.openshift.io/v1
+      - kind: StatefulSet
+        name: ""
+        version: apps/v1
+      - kind: Role
+        name: ""
+        version: rbac.authorization.k8s.io/v1
+      - kind: RoleBinding
+        name: ""
+        version: rbac.authorization.k8s.io/v1
+      - kind: Route
+        name: ""
+        version: route.openshift.io/v1
+      - kind: BuildConfig
+        name: ""
+        version: build.openshift.io/v1
+      - kind: ImageStream
+        name: ""
+        version: image.openshift.io/v1
+      - kind: Secret
+        name: ""
+        version: v1
+      - kind: PersistentVolumeClaim
+        name: ""
+        version: v1
+      - kind: ServiceAccount
+        name: ""
+        version: v1
+      - kind: Service
+        name: ""
+        version: v1
+      specDescriptors:
+      - description: Set true to enable automatic micro version product upgrades,
+          it is disabled by default.
+        displayName: Enable Upgrades
+        path: upgrades.enabled
+        value: false
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Set true to enable automatic minor product version upgrades,
+          it is disabled by default. Requires spec.upgrades.enabled to be true.
+        displayName: Include minor version upgrades
+        path: upgrades.minor
+        value: false
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Environment deployed.
+        displayName: Environment
+        path: environment
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:label
+      - description: Product version installed.
+        displayName: Version
+        path: version
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:label
+      statusDescriptors:
+      - description: Deployments for the KieApp environment.
+        displayName: Deployments
+        path: deployments
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:podStatuses
+      - description: Current phase.
+        displayName: Status
+        path: phase
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:label
+      - description: The address for accessing Business Central, if it is deployed.
+        displayName: Business/Decision Central URL
+        path: consoleHost
+        x-descriptors:
+        - urn:alm:descriptor:org.w3:link
+      version: v2
+  description: Business Automation Operator for deployment and management of RHPAM/RHDM
+    environments.
+  displayName: Business Automation
+  icon:
+  - base64data: PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2Q3MWUwMH0uY2xzLTJ7ZmlsbDojYzIxYTAwfS5jbHMtM3tmaWxsOiNmZmZ9LmNscy00e2ZpbGw6I2VhZWFlYX0uY2xzLTV7ZmlsbDojYjdiN2I3fS5jbHMtNntmaWxsOiNjZGNkY2R9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvZ288L3RpdGxlPjxnIGlkPSJMYXllcl8xIiBkYXRhLW5hbWU9IkxheWVyIDEiPjxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iNTAiIGN5PSI1MCIgcj0iNTAiIHRyYW5zZm9ybT0icm90YXRlKC00NSA1MCA1MCkiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik04NS4zNiAxNC42NGE1MCA1MCAwIDAgMS03MC43MiA3MC43MnoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik02NS43NiAzNC4yOEwxNS42IDQzLjE1djEuMTNhLjM0LjM0IDAgMCAwIC4zLjM0YzEuNDcuMTcgNy45MyAyLjExIDggMjMuNDlhLjQ2LjQ2IDAgMCAwIC4zNS40NGwyLjU5LjU3cy0xLjIxLTI1LjU0IDguNzctMjcuMDYgMTEuMiAyNy4yNyAxMS4zMyAzMS4xYS41NC41NCAwIDAgMCAuNDMuNTFsMy41MS43OHMuMDYtMzQuNTQgMTQuOTItMzYuODJ2LTMuMzV6Ii8+PHBhdGggY2xhc3M9ImNscy00IiBkPSJNNjUuMzUgMjcuNTZMMTYuMTggMzguNDJhLjc1Ljc1IDAgMCAwLS41OS43M3Y0bDUwLjE3LTguODd2LTYuNzZhMS42OCAxLjY4IDAgMCAwLS40MS4wNHoiLz48cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0zNS42MSA0Mi4wNWMtNC42MS43LTYuODMgNi41NC03Ljg5IDEyLjYxbDEzLjY1LTEuMzNjMC0uMTcuMDktLjM0LjEzLS41MXMuMTQtLjUzLjIxLS44bC4yLS42OHEuMTItLjQuMjUtLjhsLjItLjYyYy4xMi0uMzYuMjUtLjcxLjM5LTEuMDZsLjEyLS4zMmMtMS42NC00LjE3LTMuOTgtNi45OS03LjI2LTYuNDl6TTgyLjIzIDMxLjE5bC0xNi0zLjYyYTEuOSAxLjkgMCAwIDAtLjQyIDB2Ni43NmwxNy4wNiAyLjgzdi01LjIzYS43Ni43NiAwIDAgMC0uNjQtLjc0ek01My40MyA1My42MmwxOC40MS0xLjEzYzIuMS02LjA1IDUuNTEtMTEuNzUgMTEtMTIuOGwtMTctMi4wOGMtNi42OCAxLjEyLTEwLjM2IDguMjktMTIuNDEgMTYuMDF6Ii8+PHBhdGggY2xhc3M9ImNscy02IiBkPSJNNDEuNzEgNTJsLjEzLS40NS0uMTMuNDZ6TTQxLjkxIDUxLjM0bC0uMDYuMjIuMDctLjIzek0yNy43MiA1NC42NmE2OC4yNiA2OC4yNiAwIDAgMC0uOTMgMTJ2Mi40MkwzOSA2Ni4xYTEuMDYgMS4wNiAwIDAgMCAuODEtMSA1OC43MiA1OC43MiAwIDAgMSAxLjY5LTEyLjI2YzAgLjE2LS4wOS4zMy0uMTMuNDl6TTY1Ljc4IDM0LjI4bC4wMSAzLjM0IDE3LjAzIDIuMDd2LTIuNThsLTE3LjA0LTIuODN6TTUwLjg3IDc0LjQ0TDY4IDY4LjY4YS45Mi45MiAwIDAgMCAuNjMtLjc5IDcyLjQ2IDcyLjQ2IDAgMCAxIDMuMTgtMTUuNGwtMTguMzggMS4xM2E5MC45MSA5MC45MSAwIDAgMC0yLjU2IDIwLjgyek01My40MyA1My42MnoiLz48L2c+PC9zdmc+
+    mediatype: image/svg+xml
+  install:
+    spec:
+      deployments:
+      - name: business-automation-operator
+        spec:
+          replicas: 1
+          selector:
+            matchLabels:
+              name: business-automation-operator
+          strategy:
+            rollingUpdate:
+              maxSurge: 1
+              maxUnavailable: 1
+            type: RollingUpdate
+          template:
+            metadata:
+              labels:
+                name: business-automation-operator
+            spec:
+              containers:
+              - command:
+                - kie-cloud-operator
+                env:
+                - name: OPERATOR_NAME
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.labels['name']
+                - name: POD_NAME
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.name
+                - name: WATCH_NAMESPACE
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.namespace
+                - name: OPERATOR_UI
+                  value: "true"
+                - name: DEBUG
+                  value: "false"
+                image: registry.redhat.io/rhpam-7/rhpam-rhel8-operator:7.5.1
+                imagePullPolicy: Always
+                name: business-automation-operator
+                resources: {}
+              serviceAccountName: business-automation-operator
+      permissions:
+      - rules:
+        - apiGroups:
+          - ""
+          - apps
+          - apps.openshift.io
+          - rbac.authorization.k8s.io
+          - route.openshift.io
+          - build.openshift.io
+          - image.openshift.io
+          - app.kiegroup.org
+          resources:
+          - '*'
+          verbs:
+          - '*'
+        - apiGroups:
+          - monitoring.coreos.com
+          resources:
+          - servicemonitors
+          verbs:
+          - get
+          - create
+        - apiGroups:
+          - operators.coreos.com
+          resources:
+          - clusterserviceversions
+          verbs:
+          - '*'
+        - apiGroups:
+          - apps
+          resourceNames:
+          - business-automation-operator
+          resources:
+          - deployments/finalizers
+          verbs:
+          - update
+        serviceAccountName: business-automation-operator
+    strategy: deployment
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: false
+    type: AllNamespaces
+  keywords:
+  - kieapp
+  - pam
+  - decision
+  - kie
+  - cloud
+  - bpm
+  - process
+  - automation
+  - operator
+  labels:
+    alm-owner-businessautomation: businessautomation-operator
+    operated-by: businessautomation-operator.1.2.1
+  links:
+  - name: Product Page
+    url: https://access.redhat.com/products/red-hat-process-automation-manager
+  - name: Documentation
+    url: https://access.redhat.com/documentation/en-us/red_hat_process_automation_manager/7.5/#category-deploying-red-hat-process-automation-manager-on-openshift
+  maintainers:
+  - email: bsig-cloud@redhat.com
+    name: Red Hat, Inc.
+  maturity: stable
+  provider:
+    name: Red Hat, Inc.
+  replaces: businessautomation-operator.1.2.0
+  selector:
+    matchLabels:
+      alm-owner-businessautomation: businessautomation-operator
+      operated-by: businessautomation-operator.1.2.1
+  version: 1.2.1
diff --git a/deploy/catalog_resources/redhat/1.2.1/kieapp.crd.yaml b/deploy/catalog_resources/redhat/1.2.1/kieapp.crd.yaml
new file mode 120000
index 000000000..067f0ca30
--- /dev/null
+++ b/deploy/catalog_resources/redhat/1.2.1/kieapp.crd.yaml
@@ -0,0 +1 @@
+../../../crds/kieapp.crd.yaml
\ No newline at end of file
diff --git a/deploy/catalog_resources/redhat/businessautomation.package.yaml b/deploy/catalog_resources/redhat/businessautomation.package.yaml
index 13fcc3bb2..d667d40c9 100644
--- a/deploy/catalog_resources/redhat/businessautomation.package.yaml
+++ b/deploy/catalog_resources/redhat/businessautomation.package.yaml
@@ -1,5 +1,5 @@
-#! package-manifest: deploy/catalog_resources/redhat/1.2.0/businessautomation-operator.1.2.0.clusterserviceversion.yaml
-packageName: businessautomation-operator
+#! package-manifest: deploy/catalog_resources/redhat/1.2.1/businessautomation-operator.1.2.1.clusterserviceversion.yaml
 channels:
-  - name: stable
-    currentCSV: businessautomation-operator.1.2.0
+- currentCSV: businessautomation-operator.1.2.1
+  name: stable
+packageName: businessautomation-operator
diff --git a/deploy/crds/kieapp.1.1.crd.yaml b/deploy/crds/kieapp.v1.crd.yaml
similarity index 100%
rename from deploy/crds/kieapp.1.1.crd.yaml
rename to deploy/crds/kieapp.v1.crd.yaml
diff --git a/deploy/crds/kieapp.1.2.crd.yaml b/deploy/crds/kieapp.v2.crd.yaml
similarity index 100%
rename from deploy/crds/kieapp.1.2.crd.yaml
rename to deploy/crds/kieapp.v2.crd.yaml
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
index 0e62a81f0..e74e8c245 100644
--- a/deploy/operator.yaml
+++ b/deploy/operator.yaml
@@ -4,44 +4,41 @@ metadata:
   name: kie-cloud-operator
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: kie-cloud-operator
   strategy:
-    type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
       maxUnavailable: 1
-  selector:
-    matchLabels:
-      name: kie-cloud-operator
+    type: RollingUpdate
   template:
     metadata:
       labels:
         name: kie-cloud-operator
     spec:
-      serviceAccountName: kie-cloud-operator
       containers:
-        - name: kie-cloud-operator
-          image: quay.io/kiegroup/kie-cloud-operator:1.2
-          command:
-            - kie-cloud-operator
-          imagePullPolicy: Always
-          env:
-            - name: WATCH_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: OPERATOR_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.labels['name']
-            - name: DEBUG
-              value: "false"
-            - name: OPERATOR_UI
-              value: "true"
-            #- name: INSECURE
-            #  value: ""
-            #- name: REGISTRY
-            #  value: ""
+      - command:
+        - kie-cloud-operator
+        env:
+        - name: OPERATOR_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.labels['name']
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: WATCH_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: OPERATOR_UI
+          value: "true"
+        - name: DEBUG
+          value: "false"
+        image: quay.io/kiegroup/kie-cloud-operator:1.2.1
+        imagePullPolicy: Always
+        name: kie-cloud-operator
+        resources: {}
+      serviceAccountName: kie-cloud-operator
diff --git a/deploy/role.yaml b/deploy/role.yaml
index 5aab31c10..93e15fc8d 100644
--- a/deploy/role.yaml
+++ b/deploy/role.yaml
@@ -3,38 +3,37 @@ kind: Role
 metadata:
   name: kie-cloud-operator
 rules:
-  - apiGroups:
-      - ""
-      - apps
-      - app.kiegroup.org
-      - rbac.authorization.k8s.io
-      - apps.openshift.io
-      - image.openshift.io
-      - build.openshift.io
-      - route.openshift.io
-    resources:
-      - "*"
-    verbs:
-      - "*"
-  - apiGroups:
-      - monitoring.coreos.com
-    resources:
-      - servicemonitors
-    verbs:
-      - get
-      - create
-  - apiGroups:
-      - operators.coreos.com
-    resources:
-      - clusterserviceversions
-    verbs:
-      - "*"
-  - apiGroups:
-      - apps
-    resourceNames:
-      - kie-cloud-operator
-      - business-automation-operator
-    resources:
-      - deployments/finalizers
-    verbs:
-      - update
+- apiGroups:
+  - ""
+  - apps
+  - apps.openshift.io
+  - rbac.authorization.k8s.io
+  - route.openshift.io
+  - build.openshift.io
+  - image.openshift.io
+  - app.kiegroup.org
+  resources:
+  - '*'
+  verbs:
+  - '*'
+- apiGroups:
+  - monitoring.coreos.com
+  resources:
+  - servicemonitors
+  verbs:
+  - get
+  - create
+- apiGroups:
+  - operators.coreos.com
+  resources:
+  - clusterserviceversions
+  verbs:
+  - '*'
+- apiGroups:
+  - apps
+  resourceNames:
+  - kie-cloud-operator
+  resources:
+  - deployments/finalizers
+  verbs:
+  - update
diff --git a/getversion.go b/getversion.go
new file mode 100644
index 000000000..640294020
--- /dev/null
+++ b/getversion.go
@@ -0,0 +1,28 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+
+	"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/constants"
+	"github.com/kiegroup/kie-cloud-operator/version"
+)
+
+var (
+	operator = flag.Bool("operator", false, "get current operator version")
+	product  = flag.Bool("product", false, "get current product version")
+)
+
+func main() {
+	flag.Parse()
+	if !*operator && !*product {
+		fmt.Println("Operator version is " + version.Version)
+		fmt.Println("Product version is " + constants.CurrentVersion)
+	}
+	if *operator {
+		fmt.Println(version.Version)
+	}
+	if *product {
+		fmt.Println(constants.CurrentVersion)
+	}
+}
diff --git a/hack/go-build.sh b/hack/go-build.sh
index 5403d610e..10fe6ec4b 100755
--- a/hack/go-build.sh
+++ b/hack/go-build.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 REPO=https://github.com/kiegroup/kie-cloud-operator
-BRANCH=1.2.0
+BRANCH=$(go run getversion.go -operator)
 REGISTRY=quay.io/kiegroup
 IMAGE=kie-cloud-operator
-TAG=1.2
 TAR=${BRANCH}.tar.gz
 URL=${REPO}/archive/${TAR}
 CFLAGS="docker"
@@ -18,7 +17,7 @@ if [[ -z ${CI} ]]; then
     echo
     echo Now building operator:
     echo
-    operator-sdk build ${REGISTRY}/${IMAGE}:${TAG}
+    operator-sdk build ${REGISTRY}/${IMAGE}:${BRANCH}
     if [[ ${1} == "rhel" ]]; then
         if [[ ${LOCAL} != true ]]; then
             CFLAGS="osbs"
diff --git a/image.yaml b/image.yaml
index e62c1a25e..26e47ab48 100644
--- a/image.yaml
+++ b/image.yaml
@@ -2,7 +2,7 @@ schema_version: 1
 
 name: "rhpam-7/rhpam-rhel8-operator"
 description: "Red Hat Business Automation Operator"
-version: "7.5.0"
+version: "7.5.1"
 from: "ubi8:8-released"
 labels:
   - name: "maintainer"
diff --git a/modules/kie-cloud-operator/install b/modules/kie-cloud-operator/install
index bb91a963b..6227b5f25 100755
--- a/modules/kie-cloud-operator/install
+++ b/modules/kie-cloud-operator/install
@@ -32,7 +32,7 @@ if [[ ! -f ${UI_PATH} ]] ; then
 fi
 
 mv build/bin/* /usr/local/bin/
-rsync -arL deploy/catalog_resources/redhat/ /manifests
+rsync -arLv deploy/catalog_resources/redhat/ /manifests
 /usr/local/bin/user_setup
 
 yum -y autoremove ${INSTALL_PKGS}
diff --git a/pkg/components/components.go b/pkg/components/components.go
new file mode 100644
index 000000000..fe94b58de
--- /dev/null
+++ b/pkg/components/components.go
@@ -0,0 +1,218 @@
+package components
+
+import (
+	"strings"
+
+	monv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
+	v1 "github.com/kiegroup/kie-cloud-operator/pkg/apis/app/v1"
+	api "github.com/kiegroup/kie-cloud-operator/pkg/apis/app/v2"
+	oappsv1 "github.com/openshift/api/apps/v1"
+	buildv1 "github.com/openshift/api/build/v1"
+	oimagev1 "github.com/openshift/api/image/v1"
+	routev1 "github.com/openshift/api/route/v1"
+	csvv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
+	extv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+)
+
+func GetDeployment(operatorName, repository, context, imageName, tag, imagePullPolicy string) *appsv1.Deployment {
+	registryName := strings.Join([]string{repository, context, imageName}, "/")
+	image := strings.Join([]string{registryName, tag}, ":")
+	deployment := &appsv1.Deployment{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: appsv1.SchemeGroupVersion.String(),
+			Kind:       "Deployment",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: operatorName,
+		},
+		Spec: appsv1.DeploymentSpec{
+			Replicas: int32Ptr(1),
+			Strategy: appsv1.DeploymentStrategy{
+				Type: appsv1.RollingUpdateDeploymentStrategyType,
+				RollingUpdate: &appsv1.RollingUpdateDeployment{
+					MaxSurge:       &intstr.IntOrString{Type: intstr.Int, IntVal: 1},
+					MaxUnavailable: &intstr.IntOrString{Type: intstr.Int, IntVal: 1},
+				},
+			},
+			Selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{
+					"name": operatorName,
+				},
+			},
+			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						"name": operatorName,
+					},
+				},
+				Spec: corev1.PodSpec{
+					ServiceAccountName: operatorName,
+					Containers: []corev1.Container{
+						{
+							Name:            operatorName,
+							Image:           image,
+							ImagePullPolicy: corev1.PullPolicy(imagePullPolicy),
+							Command:         []string{"kie-cloud-operator"},
+							Env: []corev1.EnvVar{
+								{
+									Name: "OPERATOR_NAME",
+									ValueFrom: &corev1.EnvVarSource{
+										FieldRef: &corev1.ObjectFieldSelector{
+											FieldPath: "metadata.labels['name']",
+										},
+									},
+								},
+								{
+									Name: "POD_NAME",
+									ValueFrom: &corev1.EnvVarSource{
+										FieldRef: &corev1.ObjectFieldSelector{
+											FieldPath: "metadata.name",
+										},
+									},
+								},
+								{
+									Name: "WATCH_NAMESPACE",
+									ValueFrom: &corev1.EnvVarSource{
+										FieldRef: &corev1.ObjectFieldSelector{
+											FieldPath: "metadata.namespace",
+										},
+									},
+								},
+								{
+									Name:  "OPERATOR_UI",
+									Value: "true",
+								},
+								{
+									Name:  "DEBUG",
+									Value: "false",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	return deployment
+}
+
+func GetRole(operatorName string) *rbacv1.Role {
+	role := &rbacv1.Role{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: rbacv1.SchemeGroupVersion.String(),
+			Kind:       "Role",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: operatorName,
+		},
+		Rules: []rbacv1.PolicyRule{
+			{
+				APIGroups: []string{
+					"",
+					appsv1.SchemeGroupVersion.Group,
+					oappsv1.SchemeGroupVersion.Group,
+					rbacv1.SchemeGroupVersion.Group,
+					routev1.SchemeGroupVersion.Group,
+					buildv1.SchemeGroupVersion.Group,
+					oimagev1.SchemeGroupVersion.Group,
+					api.SchemeGroupVersion.Group,
+				},
+				Resources: []string{"*"},
+				Verbs:     []string{"*"},
+			},
+			{
+				APIGroups: []string{
+					monv1.SchemeGroupVersion.Group,
+				},
+				Resources: []string{"servicemonitors"},
+				Verbs:     []string{"get", "create"},
+			},
+			{
+				APIGroups: []string{
+					csvv1.SchemeGroupVersion.Group,
+				},
+				Resources: []string{"clusterserviceversions"},
+				Verbs:     []string{"*"},
+			},
+			{
+				APIGroups: []string{
+					appsv1.SchemeGroupVersion.Group,
+				},
+				ResourceNames: []string{operatorName},
+				Resources:     []string{"deployments/finalizers"},
+				Verbs:         []string{"update"},
+			},
+		},
+	}
+	return role
+}
+
+func GetCrd() *extv1beta1.CustomResourceDefinition {
+	plural := "kieapps"
+	crd := &extv1beta1.CustomResourceDefinition{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: extv1beta1.SchemeGroupVersion.String(),
+			Kind:       "CustomResourceDefinition",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: plural + "." + api.SchemeGroupVersion.Group,
+		},
+		Spec: extv1beta1.CustomResourceDefinitionSpec{
+			Scope:   "Namespaced",
+			Group:   api.SchemeGroupVersion.Group,
+			Version: api.SchemeGroupVersion.Version,
+			Versions: []extv1beta1.CustomResourceDefinitionVersion{
+				{
+					Name:    api.SchemeGroupVersion.Version,
+					Served:  true,
+					Storage: true,
+					Schema:  &extv1beta1.CustomResourceValidation{OpenAPIV3Schema: &extv1beta1.JSONSchemaProps{}},
+				},
+				{
+					Name:    v1.SchemeGroupVersion.Version,
+					Served:  true,
+					Storage: false,
+					Schema:  &extv1beta1.CustomResourceValidation{OpenAPIV3Schema: &extv1beta1.JSONSchemaProps{}},
+				},
+			},
+			Names: extv1beta1.CustomResourceDefinitionNames{
+				Plural:   "kieapps",
+				ListKind: "KieAppList",
+				Singular: "kieapp",
+				Kind:     "KieApp",
+			},
+			AdditionalPrinterColumns: []extv1beta1.CustomResourceColumnDefinition{
+				{Name: "Age", Type: "date", JSONPath: ".metadata.creationTimestamp"},
+				{Name: "Phase", Type: "string", JSONPath: ".status.phase"},
+			},
+			Subresources: &extv1beta1.CustomResourceSubresources{
+				Status: &extv1beta1.CustomResourceSubresourceStatus{},
+			},
+		},
+	}
+	return crd
+}
+
+func GetCR() *api.KieApp {
+	return &api.KieApp{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: api.SchemeGroupVersion.String(),
+			Kind:       "KieApp",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test",
+		},
+		Spec: api.KieAppSpec{
+			Environment: api.RhpamTrial,
+		},
+	}
+}
+
+func int32Ptr(i int32) *int32 {
+	return &i
+}
diff --git a/pkg/controller/kieapp/constants/constants.go b/pkg/controller/kieapp/constants/constants.go
index ba9fd2f49..35c36757b 100644
--- a/pkg/controller/kieapp/constants/constants.go
+++ b/pkg/controller/kieapp/constants/constants.go
@@ -8,11 +8,11 @@ import (
 
 const (
 	// CurrentVersion product version supported
-	CurrentVersion = "7.5.0"
+	CurrentVersion = "7.5.1"
 	// LastMicroVersion product version supported
 	LastMicroVersion = "7.4.1"
 	// LastMinorVersion product version supported
-	LastMinorVersion = "7.4.0"
+	LastMinorVersion = "7.5.0"
 )
 
 // SupportedVersions - product versions this operator supports
@@ -87,10 +87,10 @@ var VersionConstants = map[string]*api.VersionConfigs{
 		DatagridImageTag: "1.1",
 	},
 	LastMinorVersion: {
-		APIVersion:       v1.SchemeGroupVersion.Version,
-		ImageTag:         "1.0",
-		BrokerImage:      "amq-broker-73-openshift",
-		BrokerImageTag:   "7.3",
+		APIVersion:       api.SchemeGroupVersion.Version,
+		ImageTag:         LastMinorVersion,
+		BrokerImage:      "amq-broker",
+		BrokerImageTag:   "7.4",
 		DatagridImage:    "datagrid73-openshift",
 		DatagridImageTag: "1.1",
 	},
diff --git a/pkg/controller/kieapp/defaults/upgrade_test.go b/pkg/controller/kieapp/defaults/upgrade_test.go
index 3eec14722..c5b83b2f6 100644
--- a/pkg/controller/kieapp/defaults/upgrade_test.go
+++ b/pkg/controller/kieapp/defaults/upgrade_test.go
@@ -104,7 +104,7 @@ func TestCheckProductUpgrade(t *testing.T) {
 		},
 		Spec: api.KieAppSpec{
 			Environment: api.RhpamProduction,
-			Version:     constants.LastMinorVersion,
+			Version:     constants.LastMicroVersion,
 			Upgrades:    api.KieAppUpgrades{Minor: true, Enabled: true},
 		},
 	}
@@ -141,7 +141,7 @@ func TestCheckProductUpgrade(t *testing.T) {
 		},
 		Spec: api.KieAppSpec{
 			Environment: api.RhpamProduction,
-			Version:     constants.LastMinorVersion,
+			Version:     constants.LastMicroVersion,
 			Upgrades:    api.KieAppUpgrades{Minor: true, Enabled: false},
 		},
 	}
diff --git a/pkg/controller/kieapp/deploy_ui.go b/pkg/controller/kieapp/deploy_ui.go
index e73ef3771..a68609f48 100644
--- a/pkg/controller/kieapp/deploy_ui.go
+++ b/pkg/controller/kieapp/deploy_ui.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/RHsyseng/operator-utils/pkg/resource"
-	"github.com/RHsyseng/operator-utils/pkg/resource/compare"
-	"github.com/RHsyseng/operator-utils/pkg/resource/write"
 	"os"
 	"reflect"
 	"strings"
 	"time"
 
+	"github.com/RHsyseng/operator-utils/pkg/resource"
+	"github.com/RHsyseng/operator-utils/pkg/resource/compare"
+	"github.com/RHsyseng/operator-utils/pkg/resource/write"
 	api "github.com/kiegroup/kie-cloud-operator/pkg/apis/app/v2"
 	"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/constants"
 	"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/shared"
@@ -166,10 +166,10 @@ func getPod(namespace string, image string, sa string, operator *appsv1.Deployme
 	volume := corev1.Volume{Name: "proxy-tls"}
 	volume.Secret = &corev1.SecretVolumeSource{SecretName: volume.Name}
 	sar, err := json.Marshal(map[string]string{
-		"namespace": namespace,
-		"resource":  "kieapps",
 		"name":      name,
-		"verb":      "create",
+		"namespace": namespace,
+		"resource":  "services",
+		"verb":      "patch",
 	})
 	if err != nil {
 		log.Error("Failed to marshal sar config to json. ", err)
diff --git a/pkg/controller/kieapp/deploy_ui_test.go b/pkg/controller/kieapp/deploy_ui_test.go
index 09433cbf6..b35f99276 100644
--- a/pkg/controller/kieapp/deploy_ui_test.go
+++ b/pkg/controller/kieapp/deploy_ui_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/gobuffalo/packr/v2"
 	"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/constants"
 	"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/test"
+	"github.com/kiegroup/kie-cloud-operator/version"
 	routev1 "github.com/openshift/api/route/v1"
 	operators "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
 	"github.com/stretchr/testify/assert"
@@ -23,8 +24,8 @@ import (
 func TestUpdateLink(t *testing.T) {
 	service := test.MockServiceWithExtraScheme(&operators.ClusterServiceVersion{}, &appsv1.Deployment{}, &corev1.Pod{})
 
-	box := packr.New("CSV", "../../../deploy/catalog_resources/redhat/1.1.0")
-	bytes, err := box.Find("businessautomation-operator.1.1.0.clusterserviceversion.yaml")
+	box := packr.New("CSV", "../../../deploy/catalog_resources/redhat/"+version.Version)
+	bytes, err := box.Find("businessautomation-operator." + version.Version + ".clusterserviceversion.yaml")
 	assert.Nil(t, err, "Error reading CSV file")
 	csv := &operators.ClusterServiceVersion{}
 	err = yaml.Unmarshal(bytes, csv)
@@ -70,8 +71,8 @@ func TestUpdateLink(t *testing.T) {
 func TestUpdateExistingLink(t *testing.T) {
 	service := test.MockServiceWithExtraScheme(&operators.ClusterServiceVersion{}, &appsv1.Deployment{}, &corev1.Pod{})
 
-	box := packr.New("CSV", "../../../deploy/catalog_resources/redhat/1.1.0")
-	bytes, err := box.Find("businessautomation-operator.1.1.0.clusterserviceversion.yaml")
+	box := packr.New("CSV", "../../../deploy/catalog_resources/redhat/"+version.Version)
+	bytes, err := box.Find("businessautomation-operator." + version.Version + ".clusterserviceversion.yaml")
 	assert.Nil(t, err, "Error reading CSV file")
 	csv := &operators.ClusterServiceVersion{}
 	err = yaml.Unmarshal(bytes, csv)
diff --git a/tools/csv-gen/csv-gen.go b/tools/csv-gen/csv-gen.go
new file mode 100644
index 000000000..860268d07
--- /dev/null
+++ b/tools/csv-gen/csv-gen.go
@@ -0,0 +1,348 @@
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/blang/semver"
+	api "github.com/kiegroup/kie-cloud-operator/pkg/apis/app/v2"
+	"github.com/kiegroup/kie-cloud-operator/pkg/components"
+	"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/constants"
+	"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/defaults"
+	"github.com/kiegroup/kie-cloud-operator/tools/util"
+	"github.com/kiegroup/kie-cloud-operator/version"
+	oappsv1 "github.com/openshift/api/apps/v1"
+	buildv1 "github.com/openshift/api/build/v1"
+	oimagev1 "github.com/openshift/api/image/v1"
+	routev1 "github.com/openshift/api/route/v1"
+	csvv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+	olmversion "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/version"
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+var (
+	replacesCsvVersion = "1.2.0"
+	rh                 = "Red Hat, Inc."
+	maturity           = "stable"
+	major, minor, _    = defaults.MajorMinorMicro(constants.CurrentVersion)
+	csvs               = []csvSetting{
+		{
+			Name:         "kiecloud",
+			DisplayName:  "Kie Cloud",
+			OperatorName: "kie-cloud-operator",
+			CsvDir:       "community",
+			Registry:     "quay.io",
+			Context:      "kiegroup",
+			ImageName:    "kie-cloud-operator",
+			Tag:          version.Version,
+		},
+		{
+			Name:         "businessautomation",
+			DisplayName:  "Business Automation",
+			OperatorName: "business-automation-operator",
+			CsvDir:       "redhat",
+			Registry:     "registry.redhat.io",
+			Context:      "rhpam-" + major,
+			ImageName:    "rhpam-rhel8-operator",
+			Tag:          constants.VersionConstants[constants.CurrentVersion].ImageTag,
+		},
+	}
+)
+
+type csvSetting struct {
+	Name         string `json:"name"`
+	DisplayName  string `json:"displayName"`
+	OperatorName string `json:"operatorName"`
+	CsvDir       string `json:"csvDir"`
+	Registry     string `json:"repository"`
+	Context      string `json:"context"`
+	ImageName    string `json:"imageName"`
+	Tag          string `json:"tag"`
+}
+type csvPermissions struct {
+	ServiceAccountName string              `json:"serviceAccountName"`
+	Rules              []rbacv1.PolicyRule `json:"rules"`
+}
+type csvDeployments struct {
+	Name string                `json:"name"`
+	Spec appsv1.DeploymentSpec `json:"spec,omitempty"`
+}
+type csvStrategySpec struct {
+	Permissions []csvPermissions `json:"permissions"`
+	Deployments []csvDeployments `json:"deployments"`
+}
+type channel struct {
+	Name       string `json:"name"`
+	CurrentCSV string `json:"currentCSV"`
+}
+type packageStruct struct {
+	PackageName string    `json:"packageName"`
+	Channels    []channel `json:"channels"`
+}
+
+func main() {
+	for _, csv := range csvs {
+		operatorName := csv.Name + "-operator"
+		templateStruct := &csvv1.ClusterServiceVersion{}
+		templateStruct.SetGroupVersionKind(csvv1.SchemeGroupVersion.WithKind("ClusterServiceVersion"))
+		csvStruct := &csvv1.ClusterServiceVersion{}
+		strategySpec := &csvStrategySpec{}
+		json.Unmarshal(csvStruct.Spec.InstallStrategy.StrategySpecRaw, strategySpec)
+
+		templateStrategySpec := &csvStrategySpec{}
+		deployment := components.GetDeployment(csv.OperatorName, csv.Registry, csv.Context, csv.ImageName, csv.Tag, "Always")
+		templateStrategySpec.Deployments = append(templateStrategySpec.Deployments, []csvDeployments{{Name: csv.OperatorName, Spec: deployment.Spec}}...)
+		role := components.GetRole(csv.OperatorName)
+		templateStrategySpec.Permissions = append(templateStrategySpec.Permissions, []csvPermissions{{ServiceAccountName: deployment.Spec.Template.Spec.ServiceAccountName, Rules: role.Rules}}...)
+		// Re-serialize deployments and permissions into csv strategy.
+		updatedStrat, err := json.Marshal(templateStrategySpec)
+		if err != nil {
+			panic(err)
+		}
+		templateStruct.Spec.InstallStrategy.StrategySpecRaw = updatedStrat
+		templateStruct.Spec.InstallStrategy.StrategyName = "deployment"
+		csvVersionedName := operatorName + "." + version.Version
+		templateStruct.Name = csvVersionedName
+		templateStruct.Namespace = "placeholder"
+		descrip := csv.DisplayName + " Operator for deployment and management of RHPAM/RHDM environments."
+		repository := "https://github.com/kiegroup/kie-cloud-operator"
+		examples := []string{"{\x22apiVersion\x22:\x22app.kiegroup.org/v2\x22,\x22kind\x22:\x22KieApp\x22,\x22metadata\x22:{\x22name\x22:\x22rhpam-trial\x22},\x22spec\x22:{\x22environment\x22:\x22rhpam-trial\x22}}"}
+		templateStruct.SetAnnotations(
+			map[string]string{
+				"createdAt":           time.Now().Format("2006-01-02 15:04:05"),
+				"containerImage":      deployment.Spec.Template.Spec.Containers[0].Image,
+				"description":         descrip,
+				"categories":          "Integration & Delivery",
+				"certified":           "true",
+				"capabilities":        "Seamless Upgrades",
+				"repository":          repository,
+				"support":             rh,
+				"tectonic-visibility": "ocs",
+				"alm-examples":        "[" + strings.Join(examples, ",") + "]",
+			},
+		)
+		templateStruct.SetLabels(
+			map[string]string{
+				"operator-" + csv.Name: "true",
+			},
+		)
+		templateStruct.Spec.Keywords = []string{"kieapp", "pam", "decision", "kie", "cloud", "bpm", "process", "automation", "operator"}
+		var opVersion olmversion.OperatorVersion
+		opVersion.Version = semver.MustParse(version.Version)
+		templateStruct.Spec.Version = opVersion
+		templateStruct.Spec.Replaces = operatorName + "." + replacesCsvVersion
+		templateStruct.Spec.Description = descrip
+		templateStruct.Spec.DisplayName = csv.DisplayName
+		templateStruct.Spec.Maturity = maturity
+		templateStruct.Spec.Maintainers = []csvv1.Maintainer{{Name: rh, Email: "bsig-cloud@redhat.com"}}
+		templateStruct.Spec.Provider = csvv1.AppLink{Name: rh}
+		templateStruct.Spec.Links = []csvv1.AppLink{
+			{Name: "Product Page", URL: "https://access.redhat.com/products/red-hat-process-automation-manager"},
+			{Name: "Documentation", URL: "https://access.redhat.com/documentation/en-us/red_hat_process_automation_manager/" + major + "." + minor + "/#category-deploying-red-hat-process-automation-manager-on-openshift"},
+		}
+		templateStruct.Spec.Icon = []csvv1.Icon{
+			{
+				Data:      "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2Q3MWUwMH0uY2xzLTJ7ZmlsbDojYzIxYTAwfS5jbHMtM3tmaWxsOiNmZmZ9LmNscy00e2ZpbGw6I2VhZWFlYX0uY2xzLTV7ZmlsbDojYjdiN2I3fS5jbHMtNntmaWxsOiNjZGNkY2R9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvZ288L3RpdGxlPjxnIGlkPSJMYXllcl8xIiBkYXRhLW5hbWU9IkxheWVyIDEiPjxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iNTAiIGN5PSI1MCIgcj0iNTAiIHRyYW5zZm9ybT0icm90YXRlKC00NSA1MCA1MCkiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik04NS4zNiAxNC42NGE1MCA1MCAwIDAgMS03MC43MiA3MC43MnoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik02NS43NiAzNC4yOEwxNS42IDQzLjE1djEuMTNhLjM0LjM0IDAgMCAwIC4zLjM0YzEuNDcuMTcgNy45MyAyLjExIDggMjMuNDlhLjQ2LjQ2IDAgMCAwIC4zNS40NGwyLjU5LjU3cy0xLjIxLTI1LjU0IDguNzctMjcuMDYgMTEuMiAyNy4yNyAxMS4zMyAzMS4xYS41NC41NCAwIDAgMCAuNDMuNTFsMy41MS43OHMuMDYtMzQuNTQgMTQuOTItMzYuODJ2LTMuMzV6Ii8+PHBhdGggY2xhc3M9ImNscy00IiBkPSJNNjUuMzUgMjcuNTZMMTYuMTggMzguNDJhLjc1Ljc1IDAgMCAwLS41OS43M3Y0bDUwLjE3LTguODd2LTYuNzZhMS42OCAxLjY4IDAgMCAwLS40MS4wNHoiLz48cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0zNS42MSA0Mi4wNWMtNC42MS43LTYuODMgNi41NC03Ljg5IDEyLjYxbDEzLjY1LTEuMzNjMC0uMTcuMDktLjM0LjEzLS41MXMuMTQtLjUzLjIxLS44bC4yLS42OHEuMTItLjQuMjUtLjhsLjItLjYyYy4xMi0uMzYuMjUtLjcxLjM5LTEuMDZsLjEyLS4zMmMtMS42NC00LjE3LTMuOTgtNi45OS03LjI2LTYuNDl6TTgyLjIzIDMxLjE5bC0xNi0zLjYyYTEuOSAxLjkgMCAwIDAtLjQyIDB2Ni43NmwxNy4wNiAyLjgzdi01LjIzYS43Ni43NiAwIDAgMC0uNjQtLjc0ek01My40MyA1My42MmwxOC40MS0xLjEzYzIuMS02LjA1IDUuNTEtMTEuNzUgMTEtMTIuOGwtMTctMi4wOGMtNi42OCAxLjEyLTEwLjM2IDguMjktMTIuNDEgMTYuMDF6Ii8+PHBhdGggY2xhc3M9ImNscy02IiBkPSJNNDEuNzEgNTJsLjEzLS40NS0uMTMuNDZ6TTQxLjkxIDUxLjM0bC0uMDYuMjIuMDctLjIzek0yNy43MiA1NC42NmE2OC4yNiA2OC4yNiAwIDAgMC0uOTMgMTJ2Mi40MkwzOSA2Ni4xYTEuMDYgMS4wNiAwIDAgMCAuODEtMSA1OC43MiA1OC43MiAwIDAgMSAxLjY5LTEyLjI2YzAgLjE2LS4wOS4zMy0uMTMuNDl6TTY1Ljc4IDM0LjI4bC4wMSAzLjM0IDE3LjAzIDIuMDd2LTIuNThsLTE3LjA0LTIuODN6TTUwLjg3IDc0LjQ0TDY4IDY4LjY4YS45Mi45MiAwIDAgMCAuNjMtLjc5IDcyLjQ2IDcyLjQ2IDAgMCAxIDMuMTgtMTUuNGwtMTguMzggMS4xM2E5MC45MSA5MC45MSAwIDAgMC0yLjU2IDIwLjgyek01My40MyA1My42MnoiLz48L2c+PC9zdmc+",
+				MediaType: "image/svg+xml",
+			},
+		}
+		tLabels := map[string]string{
+			"alm-owner-" + csv.Name: operatorName,
+			"operated-by":           csvVersionedName,
+		}
+		templateStruct.Spec.Labels = tLabels
+		templateStruct.Spec.Selector = &metav1.LabelSelector{MatchLabels: tLabels}
+		templateStruct.Spec.InstallModes = []csvv1.InstallMode{
+			{Type: csvv1.InstallModeTypeOwnNamespace, Supported: true},
+			{Type: csvv1.InstallModeTypeSingleNamespace, Supported: true},
+			{Type: csvv1.InstallModeTypeMultiNamespace, Supported: false},
+			{Type: csvv1.InstallModeTypeAllNamespaces, Supported: false},
+		}
+		templateStruct.Spec.CustomResourceDefinitions.Owned = []csvv1.CRDDescription{
+			{
+				Version:     api.SchemeGroupVersion.Version,
+				Kind:        "KieApp",
+				DisplayName: "KieApp",
+				Description: "A project prescription running an RHPAM/RHDM environment.",
+				Name:        "kieapps." + api.SchemeGroupVersion.Group,
+				Resources: []csvv1.APIResourceReference{
+					{
+						Kind:    "DeploymentConfig",
+						Version: oappsv1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "StatefulSet",
+						Version: appsv1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "Role",
+						Version: rbacv1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "RoleBinding",
+						Version: rbacv1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "Route",
+						Version: routev1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "BuildConfig",
+						Version: buildv1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "ImageStream",
+						Version: oimagev1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "Secret",
+						Version: corev1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "PersistentVolumeClaim",
+						Version: corev1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "ServiceAccount",
+						Version: corev1.SchemeGroupVersion.String(),
+					},
+					{
+						Kind:    "Service",
+						Version: corev1.SchemeGroupVersion.String(),
+					},
+				},
+				SpecDescriptors: []csvv1.SpecDescriptor{
+					{
+						Description:  "Set true to enable automatic micro version product upgrades, it is disabled by default.",
+						DisplayName:  "Enable Upgrades",
+						Value:        util.RawMessagePointer("false"),
+						Path:         "upgrades.enabled",
+						XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"},
+					},
+					{
+						Description:  "Set true to enable automatic minor product version upgrades, it is disabled by default. Requires spec.upgrades.enabled to be true.",
+						DisplayName:  "Include minor version upgrades",
+						Value:        util.RawMessagePointer("false"),
+						Path:         "upgrades.minor",
+						XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"},
+					},
+					{
+						Description:  "Environment deployed.",
+						DisplayName:  "Environment",
+						Path:         "environment",
+						XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:label"},
+					},
+					{
+						Description:  "Product version installed.",
+						DisplayName:  "Version",
+						Path:         "version",
+						XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:label"},
+					},
+				},
+				StatusDescriptors: []csvv1.StatusDescriptor{
+					{
+						Description:  "Deployments for the KieApp environment.",
+						DisplayName:  "Deployments",
+						Path:         "deployments",
+						XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:podStatuses"},
+					},
+					{
+						Description:  "Current phase.",
+						DisplayName:  "Status",
+						Path:         "phase",
+						XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:label"},
+					},
+					{
+						Description:  "The address for accessing Business Central, if it is deployed.",
+						DisplayName:  "Business/Decision Central URL",
+						Path:         "consoleHost",
+						XDescriptors: []string{"urn:alm:descriptor:org.w3:link"},
+					},
+				},
+			},
+		}
+
+		if csv.OperatorName == "kie-cloud-operator" {
+			templateStruct.Annotations["certified"] = "false"
+			deployFile := "deploy/operator.yaml"
+			createFile(deployFile, deployment)
+			roleFile := "deploy/role.yaml"
+			createFile(roleFile, role)
+		}
+
+		csvFile := "deploy/catalog_resources/" + csv.CsvDir + "/" + version.Version + "/" + csvVersionedName + ".clusterserviceversion.yaml"
+		/*
+			copyTemplateStruct := templateStruct.DeepCopy()
+			copyTemplateStruct.Annotations["createdAt"] = ""
+			data := &csvv1.ClusterServiceVersion{}
+			if fileExists(csvFile) {
+				yamlFile, err := ioutil.ReadFile(csvFile)
+				if err != nil {
+					log.Printf("yamlFile.Get err   #%v ", err)
+				}
+				err = yaml.Unmarshal(yamlFile, data)
+				if err != nil {
+					log.Fatalf("Unmarshal: %v", err)
+				}
+				data.Annotations["createdAt"] = ""
+			}
+			if !reflect.DeepEqual(copyTemplateStruct.Spec, data.Spec) ||
+				!reflect.DeepEqual(copyTemplateStruct.Annotations, data.Annotations) ||
+				!reflect.DeepEqual(copyTemplateStruct.Labels, data.Labels) {
+
+				createFile(csvFile, templateStruct)
+			}
+		*/
+		createFile(csvFile, templateStruct)
+
+		packageFile := "deploy/catalog_resources/" + csv.CsvDir + "/" + csv.Name + ".package.yaml"
+		p, err := os.Create(packageFile)
+		defer p.Close()
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		pwr := bufio.NewWriter(p)
+		pwr.WriteString("#! package-manifest: " + csvFile + "\n")
+		packagedata := packageStruct{
+			PackageName: operatorName,
+			Channels: []channel{
+				{
+					Name:       maturity,
+					CurrentCSV: csvVersionedName,
+				},
+			},
+		}
+		util.MarshallObject(packagedata, pwr)
+		pwr.Flush()
+	}
+}
+
+// fileExists checks if a file exists and is not a directory before we
+// try using it to prevent further errors.
+func fileExists(filename string) bool {
+	info, err := os.Stat(filename)
+	if os.IsNotExist(err) {
+		return false
+	}
+	return !info.IsDir()
+}
+
+func createFile(filepath string, obj interface{}) {
+	f, err := os.Create(filepath)
+	defer f.Close()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	writer := bufio.NewWriter(f)
+	util.MarshallObject(obj, writer)
+	writer.Flush()
+}
diff --git a/tools/util/marshaller.go b/tools/util/marshaller.go
new file mode 100644
index 000000000..cb4aac0d7
--- /dev/null
+++ b/tools/util/marshaller.go
@@ -0,0 +1,107 @@
+package util
+
+import (
+	"encoding/json"
+	"io"
+	"strings"
+
+	"github.com/ghodss/yaml"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+)
+
+func MarshallObject(obj interface{}, writer io.Writer) error {
+	jsonBytes, err := json.Marshal(obj)
+	if err != nil {
+		return err
+	}
+
+	var r unstructured.Unstructured
+	if err := json.Unmarshal(jsonBytes, &r.Object); err != nil {
+		return err
+	}
+
+	// remove status and metadata.creationTimestamp
+	unstructured.RemoveNestedField(r.Object, "metadata", "creationTimestamp")
+	unstructured.RemoveNestedField(r.Object, "template", "metadata", "creationTimestamp")
+	unstructured.RemoveNestedField(r.Object, "spec", "template", "metadata", "creationTimestamp")
+	unstructured.RemoveNestedField(r.Object, "status")
+
+	// remove dataSource from PVCs if empty
+	templates, exists, err := unstructured.NestedSlice(r.Object, "spec", "dataVolumeTemplates")
+	if exists {
+		for _, tmpl := range templates {
+			template := tmpl.(map[string]interface{})
+			_, exists, err = unstructured.NestedString(template, "spec", "pvc", "dataSource")
+			if !exists {
+				unstructured.RemoveNestedField(template, "spec", "pvc", "dataSource")
+			}
+		}
+		unstructured.SetNestedSlice(r.Object, templates, "spec", "dataVolumeTemplates")
+	}
+	objects, exists, err := unstructured.NestedSlice(r.Object, "objects")
+	if exists {
+		for _, obj := range objects {
+			object := obj.(map[string]interface{})
+			kind, exists, _ := unstructured.NestedString(object, "kind")
+			if exists && kind == "PersistentVolumeClaim" {
+				_, exists, err = unstructured.NestedString(object, "spec", "dataSource")
+				if !exists {
+					unstructured.RemoveNestedField(object, "spec", "dataSource")
+				}
+			}
+		}
+		unstructured.SetNestedSlice(r.Object, objects, "objects")
+	}
+
+	deployments, exists, err := unstructured.NestedSlice(r.Object, "spec", "install", "spec", "deployments")
+	if exists {
+		for _, obj := range deployments {
+			deployment := obj.(map[string]interface{})
+			unstructured.RemoveNestedField(deployment, "metadata", "creationTimestamp")
+			unstructured.RemoveNestedField(deployment, "spec", "template", "metadata", "creationTimestamp")
+			unstructured.RemoveNestedField(deployment, "status")
+		}
+		unstructured.SetNestedSlice(r.Object, deployments, "spec", "install", "spec", "deployments")
+	}
+
+	// remove "managed by operator" label...
+	labels, exists, err := unstructured.NestedMap(r.Object, "metadata", "labels")
+	if exists {
+		//delete(labels, v1.ManagedByLabel)
+		unstructured.SetNestedMap(r.Object, labels, "metadata", "labels")
+	}
+
+	jsonBytes, err = json.Marshal(r.Object)
+	if err != nil {
+		return err
+	}
+
+	yamlBytes, err := yaml.JSONToYAML(jsonBytes)
+	if err != nil {
+		return err
+	}
+
+	// fix templates by removing unneeded single quotes...
+	s := string(yamlBytes)
+	s = strings.Replace(s, "'{{", "{{", -1)
+	s = strings.Replace(s, "}}'", "}}", -1)
+
+	// fix double quoted strings by removing unneeded single quotes...
+	s = strings.Replace(s, " '\"", " \"", -1)
+	s = strings.Replace(s, "\"'\n", "\"\n", -1)
+
+	yamlBytes = []byte(s)
+
+	_, err = writer.Write(yamlBytes)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func RawMessagePointer(str string) *json.RawMessage {
+	message := json.RawMessage{}
+	message = []byte(str)
+	return &message
+}
diff --git a/version/version.go b/version/version.go
index 24c2719b7..ca6243c0b 100644
--- a/version/version.go
+++ b/version/version.go
@@ -2,5 +2,5 @@ package version
 
 var (
 	// Version - current development version
-	Version = "1.2.0"
+	Version = "1.2.1"
 )