diff --git a/hana_node01/Dockerfile b/hana_node01/Dockerfile
index 404c44c..f903639 100644
--- a/hana_node01/Dockerfile
+++ b/hana_node01/Dockerfile
@@ -1,9 +1,10 @@
 FROM golang as agent-builder
 
-RUN git clone https://github.com/trento-project/agent.git
+ADD https://github.com/trento-project/agent.git agent
 RUN cd agent && make build
 
 FROM registry.suse.com/bci/bci-base
+RUN zypper -n in catatonit
 COPY --from=agent-builder /go/agent/trento-agent /usr/bin/trento-agent
 COPY --from=ghcr.io/dottorblaster/soappatrol:latest /bin/soappatrol /usr/bin/soappatrol
 COPY --from=ghcr.io/trento-project/fakemall:latest /bin/fakemall /usr/bin/fakemall
@@ -11,4 +12,4 @@ COPY . /
 
 RUN useradd -ms /bin/bash mckadm
 
-ENTRYPOINT ["/init.sh"]
+ENTRYPOINT ["catatonit", "--", "/init.sh"]
diff --git a/hana_node01/etc/config.toml b/hana_node01/etc/config.toml
index 4d2f499..cebc42c 100644
--- a/hana_node01/etc/config.toml
+++ b/hana_node01/etc/config.toml
@@ -435,3 +435,103 @@ output = """
   </status>
 </cib>
 """
+
+[[commands]]
+matches = "python /usr/sap/MCK/MCK00/exe/python_support/systemReplicationStatus.py --sapcontrol=1"
+output = """
+SAPCONTROL-OK: <begin>
+service/hana_node01/30001/SHIPPED_LOG_POSITION_TIME=2021-06-12 12:43:13.059197
+service/hana_node01/30001/LAST_LOG_POSITION_TIME=2021-06-12 12:43:13.059197
+service/hana_node01/30001/SHIPPED_FULL_REPLICA_DURATION=4060418
+service/hana_node01/30001/SHIPPED_LAST_DELTA_REPLICA_START_TIME=-
+service/hana_node01/30001/SHIPPED_FULL_REPLICA_SIZE=1913069568
+service/hana_node01/30001/SITE_ID=1
+service/hana_node01/30001/LAST_LOG_POSITION=37624000
+service/hana_node01/30001/SECONDARY_ACTIVE_STATUS=YES
+service/hana_node01/30001/LAST_SAVEPOINT_LOG_POSITION=37624081
+service/hana_node01/30001/FULL_SYNC=DISABLED
+service/hana_node01/30001/OPERATION_MODE=logreplay
+service/hana_node01/30001/SHIPPED_LAST_FULL_REPLICA_START_TIME=2021-06-11 08:43:29.183940
+service/hana_node01/30001/LAST_SAVEPOINT_VERSION=510
+service/hana_node01/30001/LAST_SAVEPOINT_START_TIME=2021-06-12 12:45:11.401787
+service/hana_node01/30001/SERVICE_NAME=nameserver
+service/hana_node01/30001/PORT=30001
+service/hana_node01/30001/SHIPPED_DELTA_REPLICA_COUNT=0
+service/hana_node01/30001/LAST_RESET_TIME=2021-06-11 08:43:19.530050
+service/hana_node01/30001/SECONDARY_FAILOVER_COUNT=0
+service/hana_node01/30001/SHIPPED_FULL_REPLICA_COUNT=1
+service/hana_node01/30001/SHIPPED_LOG_BUFFERS_DURATION=139833248
+service/hana_node01/30001/REPLICATION_STATUS_DETAILS=
+service/hana_node01/30001/SHIPPED_DELTA_REPLICA_SIZE=0
+service/hana_node01/30001/SHIPPED_LOG_POSITION=37624000
+service/hana_node01/30001/SHIPPED_DELTA_REPLICA_DURATION=0
+service/hana_node01/30001/RESET_COUNT=0
+service/hana_node01/30001/SHIPPED_LAST_DELTA_REPLICA_SIZE=0
+service/hana_node01/30001/SHIPPED_LAST_DELTA_REPLICA_END_TIME=-
+service/hana_node01/30001/SITE_NAME=Site1
+service/hana_node01/30001/SECONDARY_SITE_NAME=Site2
+service/hana_node01/30001/REPLAYED_LOG_POSITION_TIME=2021-06-12 12:43:13.059197
+service/hana_node01/30001/SHIPPED_LAST_FULL_REPLICA_END_TIME=2021-06-11 08:43:33.244358
+service/hana_node01/30001/CREATION_TIME=2021-06-11 08:43:19.530050
+site/2/SITE_NAME=Site2
+site/2/SOURCE_SITE_ID=1
+site/2/REPLICATION_MODE=SYNC
+site/2/REPLICATION_STATUS=ERROR
+overall_replication_status=ERROR
+site/1/REPLICATION_MODE=PRIMARY
+site/1/SITE_NAME=Site1
+local_site_id=1
+SAPCONTROL-OK: <end>
+"""
+
+[[commands]]
+matches = "python /usr/sap/MCK/MCK00/exe/python_support/landscapeHostConfiguration.py --sapcontrol=1"
+output = """
+SAPCONTROL-OK: <begin>
+hostActualRoles=worker
+removeStatus=
+nameServerConfigRole=master 1
+failoverStatus=
+hostConfigRoles=worker
+failoverActualGroup=default
+storageConfigPartition=1
+host=hana_node01
+indexServerConfigRole=worker
+failoverConfigGroup=default
+storageActualPartition=1
+indexServerActualRole=master
+nameServerActualRole=master
+hostActive=yes
+workerActualGroups=default
+workerConfigGroups=default
+hostStatus=ok
+storagePartition=1
+SAPCONTROL-OK: <end>
+"""
+
+[[commands]]
+matches = "/usr/sap/MCK/MCK00/exe/hdbnsutil -sr_state -sapcontrol=1"
+output = """
+SAPCONTROL-OK: <begin>
+online=true
+mode=primary
+operation mode=primary
+site id=1
+site name=Site1
+isSource=true
+isConsumer=false
+hasConsumers=true
+isTakeoverActive=false
+isPrimarySuspended=false
+mapping/hana_node01=Site2/hana02
+mapping/hana_node01=Site1/hana_node01
+siteTier/Site1=1
+siteTier/Site2=2
+siteReplicationMode/Site1=primary
+siteReplicationMode/Site2=sync
+siteOperationMode/Site1=primary
+siteOperationMode/Site2=logreplay
+siteMapping/Site1=Site2
+SAPCONTROL-OK: <end>
+done.
+"""
diff --git a/hana_node01/etc/soappatrol.toml b/hana_node01/etc/soappatrol.toml
index 74521d3..3fc9c95 100644
--- a/hana_node01/etc/soappatrol.toml
+++ b/hana_node01/etc/soappatrol.toml
@@ -7,7 +7,7 @@ response = """
     <item>
       <property>INSTANCE_NAME</property>
       <propertytype>string</propertytype>
-      <value>MCK</value>
+      <value>MCK00</value>
     </item>
     <item>
       <property>SAPLOCALHOST</property>
@@ -19,6 +19,11 @@ response = """
       <propertytype>string</propertytype>
       <value>00</value>
     </item>
+    <item>
+      <property>SAPSYSTEMNAME</property>
+      <propertytype>string</propertytype>
+      <value>MCK</value>
+    </item>
   </properties>
 </GetInstancePropertiesResponse>
 """
@@ -54,7 +59,7 @@ response = """
       <httpPort>80</httpPort>
       <httpsPort>443</httpsPort>
       <startPriority>high</startPriority>
-      <features>MESSAGESERVER</features>
+      <features>HDB</features>
       <dispstatus>SAPControl-GREEN</dispstatus>
     </item>
   </instance>
diff --git a/hana_node01/usr/bin/python b/hana_node01/usr/bin/python
new file mode 100755
index 0000000..0b252aa
--- /dev/null
+++ b/hana_node01/usr/bin/python
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+fakemall exec /etc/config.toml "python $*"
diff --git a/hana_node01/usr/sap/MCK/MCK00/exe/hdbnsutil b/hana_node01/usr/sap/MCK/MCK00/exe/hdbnsutil
new file mode 100755
index 0000000..9d74cc6
--- /dev/null
+++ b/hana_node01/usr/sap/MCK/MCK00/exe/hdbnsutil
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+fakemall exec /etc/config.toml "/usr/sap/MCK/MCK00/exe/hdbnsutil $*"
diff --git a/hana_node01/usr/sap/MCK/SYS/global/hdb/custom/config/nameserver.ini b/hana_node01/usr/sap/MCK/SYS/global/hdb/custom/config/nameserver.ini
new file mode 100644
index 0000000..70b8861
--- /dev/null
+++ b/hana_node01/usr/sap/MCK/SYS/global/hdb/custom/config/nameserver.ini
@@ -0,0 +1 @@
+id = systemId
diff --git a/hana_node01/usr/sap/MCK/SYS/global/hdb/mdc/databases.lst b/hana_node01/usr/sap/MCK/SYS/global/hdb/mdc/databases.lst
new file mode 100644
index 0000000..02ca988
--- /dev/null
+++ b/hana_node01/usr/sap/MCK/SYS/global/hdb/mdc/databases.lst
@@ -0,0 +1,4 @@
+# DATABASE:CONTAINER:USER:GROUP:USERID:GROUPID:HOST:SQLPORT:ACTIVE
+PRD::::::hana_node01:30015:yes
+
+MCK::::::hana_node01:30044:yes