diff --git a/src/amazon-sns-sqs-mcp-server/awslabs/amazon_sns_sqs_mcp_server/server.py b/src/amazon-sns-sqs-mcp-server/awslabs/amazon_sns_sqs_mcp_server/server.py
index 1217a5bd99..fe79c24ff0 100644
--- a/src/amazon-sns-sqs-mcp-server/awslabs/amazon_sns_sqs_mcp_server/server.py
+++ b/src/amazon-sns-sqs-mcp-server/awslabs/amazon_sns_sqs_mcp_server/server.py
@@ -15,20 +15,30 @@
 """Main server module for Amazon SNS and SQS MCP server."""
 
 import argparse
-from awslabs.amazon_sns_sqs_mcp_server.consts import MCP_SERVER_VERSION
 from awslabs.amazon_sns_sqs_mcp_server.sns import register_sns_tools
 from awslabs.amazon_sns_sqs_mcp_server.sqs import register_sqs_tools
 from mcp.server.fastmcp import FastMCP
 
 
-# instantiate base server
-mcp = FastMCP(
-    'awslabs.amazon-sns-sqs-mcp-server',
-    instructions="""Manage Amazon SNS topics, subscriptions, and Amazon SQS queues for messaging.""",
-    dependencies=['pydantic', 'boto3'],
-    version=MCP_SERVER_VERSION,
+# Define server instructions and dependencies
+SERVER_INSTRUCTIONS = (
+    """Manage Amazon SNS topics, subscriptions, and Amazon SQS queues for messaging."""
 )
 
+SERVER_DEPENDENCIES = ['pydantic', 'boto3']
+
+
+def create_server():
+    """Create and configure the MCP server instance."""
+    return FastMCP(
+        'awslabs.amazon-sns-sqs-mcp-server',
+        instructions=SERVER_INSTRUCTIONS,
+        dependencies=SERVER_DEPENDENCIES,
+    )
+
+
+mcp = create_server()
+
 
 def main():
     """Run the MCP server with CLI argument support."""