diff --git a/src/index.ts b/src/index.ts
index 8c791c6..040e03d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -87,9 +87,6 @@ if (process.env.OPENTELEMETRY_ENABLED === "true") {
     ]);
 }
 
-// Get the current timestamp
-let timestamp: string = common.getTimeStamp();
-
 if (useSentry) {
     app.use(Sentry.Handlers.requestHandler());
     app.use(Sentry.Handlers.tracingHandler());
diff --git a/src/mucha.ts b/src/mucha.ts
index da26e63..ee80fcb 100644
--- a/src/mucha.ts
+++ b/src/mucha.ts
@@ -4,7 +4,7 @@ import moment from "moment";
 import { Config } from "./config";
 import { Module } from "./module";
 
-const PORT = 10082;
+const PORT = process.env.MUCHA_PORT !== undefined ? parseInt(process.env.MUCHA_PORT) : 10082;
 
 export default class MuchaModule extends Module {
     register(app: Application): void {