diff --git a/ace-setup-mq/prep-mq.sh b/ace-setup-mq/prep-mq.sh
new file mode 100644
index 0000000..d9af0b7
--- /dev/null
+++ b/ace-setup-mq/prep-mq.sh
@@ -0,0 +1,231 @@
+#!/bin/bash
+#Functions
+# 0: print usage
+printUsage(){
+    echo -e "\033[1;33mThis script will try to cover following things:\033[0m"
+    echo "1. Check user running this script has authority to execute MQSC commands"
+    echo "2. Check the available listener ports and define a new one if there is no available"
+    echo "3. Define a channel and set authrec for it with the specified user"
+    echo "4. Check the connectivity of the channel with specified user"
+    echo "5. Define a topic or use existing topic object for topic string '$SYS/Broker' and set authrec for it"
+    echo "6. List the useful info you can use to set in configuration.yaml for plugin.ace"
+    echo -e "\033[1;31mNote: this script will cover most cases, but sometimes if you fail to create the mq objects, please contact IBM Instana support or contact IBM MQ support team for help. \033[0m"
+    echo -e "\033[1;33mUsage: $0 -q <QMGR_NAME> -d <MQ_BIN_PATH> -u <AUTH_USER>\033[0m"
+    echo -e "\033[1;33mExample $0 -q QM1 -d /opt/mqm/bin -u root\033[0m"
+}
+
+# 1. Check the current user has authority to execute MQSC commands
+preCheck(){
+    # Check user authority
+    if groups | tr ' ' '\n' | grep -q '^mqm$'; then
+        echo -e "\033[1;32mINFO: The user launched the script belongs to mqm group\033[0m"
+    else
+        echo -e "\033[1;31mERROR: The user launched the script doesn't belong to mqm group, please use an authorized user to execute MQSC commands\033[0m"
+        exit 1
+    fi
+
+    # check mq bin path 
+    echo "Check the MQ_BIN_PATH exists and file setmqenv exists"
+    if [ ! -d "$MQ_BIN_PATH" ] || [ ! -f "$MQ_BIN_PATH/setmqenv" ]; then
+        echo -e "\033[1;31mERROR: The path $MQ_BIN_PATH or the file $MQ_BIN_PATH/setmqenv does not exist or both don't exist.\033[0m"
+        exit 1
+    else
+        echo -e "\033[1;32mINFO: The $MQ_BIN_PATH and related file setmqenv exist.\033[0m"
+    fi
+
+    # Setup mq environment to accept mqsc command. 
+    echo -e "\033[1;33mINFO: Setup mq environment to accept mqsc command\033[0m"
+    . $MQ_BIN_PATH/setmqenv -s 
+    if [ $? -eq 0 ]; then
+       echo -e "\033[1;32mINFO: The environment has been set successfully. \033[0m"
+    else
+       echo -e "\033[1;31mERROR: Failed to set the environment\033[0m"
+       exit 1
+    fi
+}
+# 2. Set correct authority for $AUTH_USER to access QMGR.
+setQmgrAuth(){
+    echo -e "\033[1;33mINFO: Set authority for user $AUTH_USER to access QMGR.\033[0m"
+    echo "The user $AUTH_USER has following authority before setting:"
+    echo  "$(dmpmqaut -m $QMGR_NAME -t qmgr -p $AUTH_USER)"
+    setmqaut -m "$QMGR_NAME" -t qmgr -p "$AUTH_USER" +connect +inq
+    if [ $? -eq 0 ]; then
+        echo -e "\033[1;32mINFO: The authority has been set succesfully for user $AUTH_USER\033[0m"
+        echo "The user $AUTH_USER has following authority after setting:"
+        echo  "$(dmpmqaut -m $QMGR_NAME -t qmgr -p $AUTH_USER 2>&1)"
+    else
+        echo -e "\033[1;31mERROR: Failed to set the authority for user $AUTH_USER to $QMGR_NAME\033[0m"
+        echo -e "\033[1;31m$RESULT\033[0m"
+        exit 1
+    fi
+}
+
+# 3. Print out all available listener ports
+getListenerPort(){
+    listener_ports=$(echo "dis LISTENER(*) PORT" | runmqsc "$QMGR_NAME" | awk '/PORT/ {gsub("[^0-9]", "", $NF); print $NF}')
+    if [ -n "$listener_ports" ]; then
+       while read -r port; do
+            if checkPort $port; then
+                AVAILABLE_PORTS+=" $port"
+                echo -e "\033[1;32mINFO: Port $port is open and accepting connections.\033[0m"
+            else
+                echo -e "\033[1;33mWARNING: Port $port is not open or not accepting connections.\033[0m"
+            fi
+        done <<< "$listener_ports"
+    fi
+    if [ -n "$AVAILABLE_PORTS" ]; then
+        echo -e "\033[1;32mINFO: Found available ports: $AVAILABLE_PORTS\033[0m"
+    else
+        echo "Create a listener as there is no listener port found"
+        echo "DEFINE LISTENER($LISTENER_NAME) TRPTYPE(TCP) PORT($LISTENER_PORT)" | runmqsc "$QMGR_NAME"
+        echo "START LISTENER($LISTENER_NAME) IGNSTATE(NO)" | runmqsc "$QMGR_NAME" 
+        if checkPort $LISTENER_PORT; then
+            AVAILABLE_PORTS+=" $LISTENER_PORT"
+            echo -e "\033[1;32mINFO: Port $LISTENER_PORT is open and accepting connections.\033[0m"
+        else
+            echo -e "\033[1;31mERROR: Port $LISTENER_PORT is not open or not accepting connections. Please check and fix.\033[0m" 
+            exit 1
+        fi
+    fi
+}
+
+checkPort() {
+    local port="$1"
+    os_type=$(uname -s)
+    if [ -z "$port" ] || [ "$port" -eq 0 ]; then
+        echo -e "\033[1;31mERROR: Invalid port number: $port\033[0m"
+        return 1
+    fi
+    if [[ "$os_type" == "Linux" ]]; then 
+        if ! command -v nc >/dev/null 2>&1; then
+            echo -e "\033[1;31mERROR: nc command not found: $port\033[0m"
+            return 1
+        fi
+        nc -zv localhost "$port" >/dev/null 2>&1
+    else
+        if ! command -v telnet >/dev/null 2>&1; then
+             echo -e "\033[1;31mERROR: telnet command not found: $port\033[0m"
+            return 1
+        fi
+        telnet localhost "$port" >/dev/null 2>&1
+    fi
+}
+
+# 4. Create channel and topic, set authrec for them.
+prepChannelAndTopic(){
+    CHECK_CHANNEL=$(echo "DISPLAY CHANNEL($CHANNEL_NAME)" | runmqsc "$QMGR_NAME")
+    if [[ "$CHECK_CHANNEL" != *"not found"* ]]; then 
+        echo -e "\033[1;31mERROR: The channel exists, please try another CHANNEL_NAME or delete the existing channel and rerun the script. \033[0m"
+        echo -e "\033[1;31mYou can use revert-mq.sh to delete this channel and revert all created objects:\033[0m"
+        echo -e "./revert-mq.sh -q $QMGR_NAME -d $MQ_BIN_PATH -u $AUTH_USER -l $LISTENER_NAME -c $CHANNEL_NAME"
+        echo "$CHECK_CHANNEL"
+        exit 1
+    fi
+    # Execute the MQSC commands
+    echo "$MQSC_CHECK_CHANNEL" | runmqsc "$QMGR_NAME"
+
+    # Verify the user authority of channel connection
+    OUTPUT=$(echo "dis chlauth($CHANNEL_NAME) MATCH(RUNCHECK) CLNTUSER('$AUTH_USER') ADDRESS('0.0.0.0')" | runmqsc "$QMGR_NAME")
+    EXPECTED_OUTPUT="AMQ9783I: Channel will run using MCAUSER('$AUTH_USER')."                     
+
+    if [[ "$OUTPUT" == *"$EXPECTED_OUTPUT"* ]]; then
+        echo -e "\033[1;32mINFO: The channel authority is set successfully with output:\033[0m"
+        echo -e "\033[1;32m$EXPECTED_OUTPUT\033[0m"
+        EXISTING_TOPIC=$(echo "dis TOPIC(*) WHERE(TOPICSTR EQ '$TOPIC_STR')" | runmqsc "$QMGR_NAME")
+        # Create a topic if it doesn't exist
+        if [[ $EXISTING_TOPIC == *"not found"* ]]; then
+            echo "Topic object with TOPICSTR '$TOPIC_STR' not found. Creating a new one..."
+            echo "DEFINE TOPIC($TOPIC_NAME) TOPICSTR('$TOPIC_STR')" | runmqsc "$QMGR_NAME"
+        else
+            echo -e "\033[1;32mINFO: Topic object with TOPICSTR '$TOPIC_STR' already exists.\033[0m"
+            TOPIC_NAME=$(echo "$EXISTING_TOPIC" | sed -n '/TOPIC(\*/d; s/^.*TOPIC(\([^)]*\)).*$/\1/p')
+        fi
+        # Set authrec for the topic
+        echo "$MQSC_SET_AUTH_4_TOPIC" | runmqsc "$QMGR_NAME"
+        echo "Set authrec for the topic $TOPIC_NAME"
+        # Verify the authrec exists
+        EXISTING_AUTHREC=$(echo "DIS AUTHREC PROFILE($TOPIC_NAME) OBJTYPE(TOPIC)" | runmqsc "$QMGR_NAME")
+        # Print the result 
+        if [[ $EXISTING_AUTHREC == *"not found"* ]]; then
+            echo -e "\033[1;31mERROR: AUTHREC for topic '$TOPIC_NAME' does not exist.Please check the commands execution result\033[0m"
+            echo "$EXISTING_AUTHREC"
+            exit 1
+        else
+            echo -e "\033[1;32mINFO: AUTHREC for topic '$TOPIC_NAME' exists.\033[0m"
+        fi
+    else
+        echo -e "\033[1;31mERROR: The channel authority is failed to set. Check the blocking AUTHREC and fix it.\033[0m"
+        echo -e "$OUTPUT"
+        exit 1
+    fi
+}
+
+# 5. Print out useful info you need in setting configuration.yaml
+printConnInfo(){
+    echo -e "\033[1;32mHint: Please set the configuration.yaml for ACE sensor with following info:\033[0m"
+    echo -e "\033[1;32m queuemanagerName:  $QMGR_NAME\033[0m"
+    echo -e "\033[1;32m mqport:           $AVAILABLE_PORTS (choose one)\033[0m"
+    echo -e "\033[1;32m channel:           $CHANNEL_NAME\033[0m"
+    echo -e "\033[1;32m mqUsername:        $AUTH_USER\033[0m"
+    echo -e "\033[1;32mThis tool only covers basic info, for other info, like user password and SSL related info, please check manually and set properly.\033[0m"
+    echo -e  "\033[1;33mINFO: If you want to revert the authority and clean up the objects created,  please make sure you have downloaded the revert-mq.sh script and run like following: \033[0m"
+    echo "./revert-mq.sh -q $QMGR_NAME -d $MQ_BIN_PATH -u $AUTH_USER -l $LISTENER_NAME -c $CHANNEL_NAME -t $TOPIC_NAME"
+}
+
+
+# 0: Init
+# Define the variables 
+CHANNEL_NAME='INSTANA.ACE.SVRCONN'
+TOPIC_NAME='INSTANA.ACE.BROKER.TOPIC'
+TOPIC_STR='$SYS/Broker'
+LISTENER_NAME='INSTANA.ACE.LST'
+LISTENER_PORT='2121'
+AVAILABLE_PORTS=''
+# Check the parameters
+while getopts ":q:d:u:" opt; do
+    case ${opt} in
+        q)
+          QMGR_NAME=${OPTARG}
+          ;;
+        d)
+          MQ_BIN_PATH=${OPTARG}
+          ;;
+        u)
+          AUTH_USER=${OPTARG}
+          ;;
+        ?)
+          printUsage
+          exit 1
+          ;;
+    esac
+done
+shift $(($OPTIND - 1))
+
+if [[ -z "$QMGR_NAME" || -z "$MQ_BIN_PATH" || -z "$AUTH_USER" ]]; then
+    echo -e "\033[1;31mERROR: These arguments are required, but seems they are not set correctly."
+    echo "QMGR_NAME: $QMGR_NAME"
+    echo "MQ_BIN_PATH: $MQ_BIN_PATH"
+    echo "AUTH_USER:$AUTH_USER"
+    printUsage
+    exit 1
+fi
+
+# Define the MQSC commands fro channel creating
+read -r -d '' MQSC_CHECK_CHANNEL << EOF
+DEFINE CHANNEL($CHANNEL_NAME) CHLTYPE(SVRCONN) TRPTYPE(TCP) MCAUSER('$AUTH_USER')
+SET CHLAUTH($CHANNEL_NAME) TYPE(BLOCKUSER) USERLIST('nobody') DESCR('Block all users except authorized users')
+SET AUTHREC profile($CHANNEL_NAME) objtype(channel) PRINCIPAL('$AUTH_USER') AUTHADD(ALL)
+REFRESH SECURITY
+EOF
+
+read -r -d '' MQSC_SET_AUTH_4_TOPIC << EOF
+SET AUTHREC profile($TOPIC_NAME) objtype(topic) PRINCIPAL('$AUTH_USER') AUTHADD(ALL)
+REFRESH SECURITY
+EOF
+
+printUsage
+preCheck
+setQmgrAuth
+getListenerPort
+prepChannelAndTopic
+printConnInfo
diff --git a/ace-setup-mq/readme.md b/ace-setup-mq/readme.md
new file mode 100644
index 0000000..d7b4ebd
--- /dev/null
+++ b/ace-setup-mq/readme.md
@@ -0,0 +1,58 @@
+# Declaration
+
+The following scripts help you to prepare the IBM MQ objects for ACE monitoring. You can modify these scripts on demand for different environments. As an assistant tool, no official support to these scripts are provided.
+
+# Supported OS
+
+- Ubuntu 20.04
+- RHEL 9.4
+- AIX 7.2 
+
+# `prep-mq.sh` script
+
+## Description
+ 
+The script `prep-mq.sh` creates resources and sets authority correctly in QMGR for the ACE sensor. 
+* Run the script with a user who belongs to `mqm` group and on the machine that hosts the queue manager.
+* `AUTH_USER` in the script is the user that you want to grant authority. The user needn't be a privileged user.
+ 
+## Usage
+
+To run the `prep-mq.sh` script, complete the following steps:
+
+1. Download the `prep-mq.sh` script. 
+2. Make the script executable:
+    ```
+    chmod +x prep-mq.sh
+    ```
+    {: codeblock}
+3. Go to the directory, and run the script:
+    ```sh
+    ./prep-mq.sh -q <QMGR_NAME>  -d <MQ_BIN_PATH> -u <AUTH_USER>
+    ```
+    {: codeblock}
+    
+# `revert-mq.sh` script
+
+## Description
+
+The `revert-mq.sh` script reverts the authority granted with the `prep-revert.sh` script and deletes the objects created in QMGR for the ACE sensor. 
+* Run the script with a user who belongs to `mqm `group and on the machine which hosts the queue manager.
+* `AUTH_USER` in the script is the user that you used in the `prep-mq.sh` script.
+ 
+## Usage
+
+To run the `revert-mq.sh` script, complete the following steps:
+
+1. Download the `revert-mq.sh` script.
+2. Make the script executable:
+    ```
+    chmod +x revert-mq.sh
+    ```
+    {: codeblock}
+3. Go to the directory, and run the script:
+    ```sh
+    ./revert-mq.sh -q <QMGR_NAME> -d <MQ_BIN_PATH> [-u AUTH_USER] [-l LISTENER_NAME]  [-c CHANNEL_NAME]  [-t TOPIC_NAME]
+    ```
+    {: codeblock}
+
diff --git a/ace-setup-mq/revert-mq.sh b/ace-setup-mq/revert-mq.sh
new file mode 100644
index 0000000..3cb29b2
--- /dev/null
+++ b/ace-setup-mq/revert-mq.sh
@@ -0,0 +1,168 @@
+#!/bin/bash
+# Functions
+printUsage() {
+    echo -e "\033[1;33mThis script will delete the specified objects:\033[0m"
+    echo "1. Check user running this script has authority to execute MQSC commands"
+    echo "2. Remove the qmgr authority(connect+inq) for the specified user"
+    echo "3. Delete the specified listener/channel/topic"
+    echo -e "\033[1;33m Usage: $0 -q <QMGR_NAME> -d <MQ_BIN_PATH> [-u AUTH_USER] [-l LISTENER_NAME] [-c CHANNEL_NAME] [-t TOPIC_NAME]\033[0m"
+    echo -e "\033[1;33m Example: $0 -q QM1 -d /opt/mqm/bin -u root -l INSTANA.ACE.LST -c INSTANA.ACE.SVRCONN -t INSTANA.ACE.BROKER.TOPIC\033[0m"
+}
+
+# 1. Check the current user has authority to execute MQSC commands
+preCheck() {
+    # Check user authority
+    echo "Check if current user has the authority to execute MQSC commands"
+    if groups | tr ' ' '\n' | grep -q '^mqm$'; then
+        echo -e "\033[1;32mINFO: The user launched the script belongs to mqm group\033[0m"
+    else
+        echo -e "\033[1;31mERROR: The user launched the script doesn't belong to mqm group, please use an authorized user to execute MQSC commands\033[0m"
+        exit 1
+    fi
+
+    # check mq bin path 
+    echo "Check the MQ_BIN_PATH exists and file setmqenv exists"
+    if [ ! -d "$MQ_BIN_PATH" ] || [ ! -f "$MQ_BIN_PATH/setmqenv" ]; then
+        echo -e "\033[1;31mERROR: The path $MQ_BIN_PATH or the file $MQ_BIN_PATH/setmqenv does not exist or both don't exist.\033[0m"
+        exit 1
+    else
+        echo -e "\033[1;32mINFO: The $MQ_BIN_PATH and related file setmqenv exist.\033[0m"
+    fi    
+
+    # Setup mq environment to accept mqsc command. 
+    echo -e "\033[1;33mINFO: Setup mq environment to accept mqsc command\033[0m"
+    . $MQ_BIN_PATH/setmqenv -s 
+    if [ $? -eq 0 ]; then
+       echo -e "\033[1;32mINFO: The environment has been set successfully. \033[0m"
+    else
+       echo -e "\033[1;31mERROR: Failed to set the environment\033[0m"
+       exit 1
+    fi
+}
+# 2. remove authority to qmgr for specified user
+removeQmgrAuth(){
+    echo  -e "\033[1;33mINFO: Remove connect/inq authority to qmgr $QMGR_NAME for user $AUTH_USER listener object\033[0m"
+    AUTH_RECORDS=$(dmpmqaut -m $QMGR_NAME -t qmgr -p $AUTH_USER 2>&1)
+    echo "The user $AUTH_USER has following authority before removing: $AUTH_RECORDS"
+    if [[ "$AUTH_RECORDS" == *"No matching authority records."* ]]; then 
+            echo -e "\033[1;32mINFO: No matching authority records for $AUTH_USER\033[0m"
+    else
+        setmqaut -m $QMGR_NAME -t qmgr -p $AUTH_USER -connect -inq
+        if [ $? -eq 0 ]; then
+            echo -e "\033[1;32mINFO: The authority has been removed succesfully for user $AUTH_USER\033[0m"
+            echo "The user $AUTH_USER has following authority after removing:"
+        else
+            echo -e "\033[1;31mERROR: Failed to remove the authority for user $AUTH_USER to $QMGR_NAME, please remove it manually\033[0m"
+            echo "$(dmpmqaut -m $QMGR_NAME -t qmgr -p $AUTH_USER 2>&1)" 
+        fi
+   fi
+   
+}
+
+# 3. delete objects
+deleteObjects() {
+    # delete listener
+    if [ -n "$LISTENER_NAME" ]; then 
+        echo  -e "\033[1;33mINFO: Delete listener object\033[0m"
+        listener=$(echo "dis LISTENER($LISTENER_NAME)" | runmqsc "$QMGR_NAME" 2>&1)
+        if [[ "$listener" == *"not found"* ]]; then
+            echo -e "\033[1;32mINFO: Nothing to delete as the $LISTENER_NAME is not found\033[0m"
+        else
+            echo "stop LISTENER($LISTENER_NAME) IGNSTATE(NO)"  | runmqsc "$QMGR_NAME"
+            if [ $? -eq 0 ]; then
+                echo "delete LISTENER($LISTENER_NAME) IGNSTATE(NO)" | runmqsc "$QMGR_NAME" 
+                if [ $? -eq 0 ]; then
+                    echo  -e "\033[1;32mINFO: Listenter $LISTENER_NAME has been deleted successfully.\033[0m"
+                else
+                    echo -e "\033[1;31mERROR: Failed to delete listenter $LISTENER_NAME, please remove it manually\033[0m"
+                    echo "dis LISTENER($LISTENER_NAME)" | runmqsc "$QMGR_NAME"
+                fi
+            else
+                echo -e "\033[1;31mERROR: Failed to stop listenter $LISTENER_NAME, please chekc and remove it manually\033[0m"
+            fi 
+        fi       
+    else 
+        echo -e "\033[1;32mINFO: Nothing to delete as the listener name is empty\033[0m"
+    fi
+
+    # delete channel
+    if [ -n "$CHANNEL_NAME" ]; then 
+        echo  -e "\033[1;33mINFO: Delete channel object\033[0m"
+        channel=$(echo "dis CHANNEL($CHANNEL_NAME)" | runmqsc "$QMGR_NAME" 2>&1)
+        if [[ "$channel" == *"not found"* ]]; then
+            echo -e "\033[1;32mINFO: Nothing to delete as the $CHANNEL_NAME is not found\033[0m"
+        else
+            echo "delete CHANNEL($CHANNEL_NAME) IGNSTATE(YES)" | runmqsc "$QMGR_NAME"
+            if [ $? -eq 0 ]; then
+                echo  -e "\033[1;32mINFO: Channel $CHANNEL_NAME has been deleted successfully.\033[0m"
+            else
+                echo -e "\033[1;31mERROR: Failed to delete channel $CHANNEL_NAME, please remove it manually\033[0m"
+                echo "dis CHANNEL($CHANNEL_NAME)" | runmqsc "$QMGR_NAME"
+            fi
+        fi
+    else 
+        echo -e "\033[1;32mINFO: Nothing to delete as the channel name is empty\033[0m"
+    fi
+    # delete topic
+    if [ -n "$TOPIC_NAME" ]; then 
+        echo  -e "\033[1;33mINFO: Delete topic object\033[0m"
+        topic=$(echo "dis TOPIC($TOPIC_NAME)" | runmqsc "$QMGR_NAME" 2>&1)
+        if [[ "$topic" == *"not found"* ]]; then
+            echo -e "\033[1;32mINFO: Nothing to delete as the $TOPIC_NAME is not found\033[0m"
+        else
+            echo "delete TOPIC($TOPIC_NAME) AUTHREC(YES)" | runmqsc "$QMGR_NAME"
+            if [ $? -eq 0 ]; then
+                echo  -e "\033[1;32mINFO: Topic object $TOPIC_NAME has been deleted successfully.\033[0m"
+            else
+                echo -e "\033[1;31mERROR: Failed to delete topic object $TOPIC_NAME, please remove it manually\033[0m"
+                echo "dis TOPIC($CHANNEL_NAME)" | runmqsc "$QMGR_NAME"
+            fi
+        fi
+    else 
+        echo -e "\033[1;32mINFO: Nothing to delete as the topic name is empty\033[0m"
+    fi
+}
+
+# Init
+# Check the parameters
+while getopts ":q:d:u:l:c:t:" opt; do
+    case ${opt} in
+        q)
+          QMGR_NAME=${OPTARG}
+          ;;
+        d)
+          MQ_BIN_PATH=${OPTARG}
+          ;;
+        u)
+          AUTH_USER=${OPTARG}
+          ;;
+        l)
+          LISTENER_NAME=${OPTARG}
+          ;;
+        c)
+          CHANNEL_NAME=${OPTARG}
+          ;;
+        t)
+          TOPIC_NAME=${OPTARG}
+          ;;
+        ?)
+          printUsage
+          exit 1
+          ;;
+    esac
+done
+shift $(($OPTIND - 1))
+
+if [[ -z "$QMGR_NAME" || -z "$MQ_BIN_PATH" ]]; then
+    echo -e "\033[1;31mERROR: These arguments are required, but seems they are not set correctly\033[0m"
+    echo "QMGR_NAME: $QMGR_NAME"
+    echo "MQ_BIN_PATH: $MQ_BIN_PATH"
+    printUsage
+    exit 1
+fi
+
+# Call functions
+printUsage
+preCheck
+removeQmgrAuth
+deleteObjects