diff --git a/roles/provision-gw-http-sink-apb/tasks/main.yml b/roles/provision-gw-http-sink-apb/tasks/main.yml
index 28d57d3..8c3021e 100644
--- a/roles/provision-gw-http-sink-apb/tasks/main.yml
+++ b/roles/provision-gw-http-sink-apb/tasks/main.yml
@@ -1,14 +1,13 @@
-- name: create Event-Type/topic config map
-  k8s_v1_config_map:
-    name: '{{ event_type | lower }}'
-    namespace: '{{ namespace }}'
-    labels:
-      strimzi.io/kind: topic
-      strimzi.io/cluster: my-cluster
-    data:
-      name: '{{ event_type }}'
-      partitions: '1'
-      replicas: '1'
+- name: "create Event-Type/topic CR file"
+  template:
+    src: kafka-topic.yaml.j2
+    dest: /tmp/kafka-topic.yaml
+
+- name: "Create Event-Type/topic"
+  shell: "oc create -f /tmp/kafka-topic.yaml -n {{ namespace }}"
+
+- name: "Delete Event-Type/topic Template File"
+  file: path=/tmp/kafka-topic.yaml state=absent
 
 - name: create deployment config
   k8s_extensions_v1beta1_deployment:
@@ -29,6 +28,6 @@
        value: '{{ consumer_group }}'
      - name: HTTP_OUTPUT_ENDPOINT
        value: '{{ http_uri }}'
-     image: docker.io/streamzi/gw-http-sink:latest
+     image: docker.io/streamzi/cloudevents-gateway-http-sink:latest
      imagePullPolicy: IfNotPresent
      name: http-sink
diff --git a/roles/provision-gw-http-sink-apb/templates/kafka-topic.yaml.j2 b/roles/provision-gw-http-sink-apb/templates/kafka-topic.yaml.j2
new file mode 100644
index 0000000..30e8a4b
--- /dev/null
+++ b/roles/provision-gw-http-sink-apb/templates/kafka-topic.yaml.j2
@@ -0,0 +1,14 @@
+apiVersion: kafka.strimzi.io/v1alpha1
+kind: KafkaTopic
+metadata:
+  name: {{ event_type | lower }}
+  labels:
+    strimzi.io/cluster: my-cluster
+spec:
+  partitions: 1
+  replicas: 1
+  config:
+    retention.ms: 7200000
+    segment.bytes: 1073741824
+ 
+