diff --git a/packages/srcmap-api/src/triggers.ts b/packages/srcmap-api/src/triggers.ts
index 9b03e9f8..0255d322 100644
--- a/packages/srcmap-api/src/triggers.ts
+++ b/packages/srcmap-api/src/triggers.ts
@@ -56,22 +56,23 @@ export const triggerSourceMapCompiler = async (_payload: ISrcMapApiPayload) => {
   })
 
   if (!payload.pathSourceData) {
-    const msg = '/Compiler Trigger/No source data found'
-    console.warn(payload.address, msg)
+    const message = '/Compiler Trigger/No source data found'
+    console.warn(payload.address, message)
     return setDdbContractInfo({
       ...payload,
       status: SrcMapStatus.COMPILATOR_TRIGGERRING_FAILED,
-      message: msg,
+      message,
     })
   }
 
   if (!payload.compilerVersion) {
-    const msg = '/Compiler Trigger/No compiler version found'
-    console.warn(payload.address, msg)
+    const message = '/Compiler Trigger/No compiler version found'
+    console.warn(payload.address, message)
+    captureMessage(message, 'error')
     return setDdbContractInfo({
       ...payload,
       status: SrcMapStatus.COMPILATOR_TRIGGERRING_FAILED,
-      message: msg,
+      message,
     })
   }
 
diff --git a/packages/srcmap-compiler/src/helpers.ts b/packages/srcmap-compiler/src/helpers.ts
index bd862895..9f63bad7 100644
--- a/packages/srcmap-compiler/src/helpers.ts
+++ b/packages/srcmap-compiler/src/helpers.ts
@@ -251,7 +251,7 @@ export const compileFiles = async (
   console.log(_payload.address, '/Compilation/Done')
   const pathSourceMaps = await Promise.all(
     sourceMaps.map(async (sourceMap) => {
-      const path = `contracts/${_payload.chainId}/${_payload.address}/source_maps/${sourceMap.fileName}`
+      const path = `contracts/${_payload.chainId}/${_payload.address}/source_maps/${sourceMap.fileName}_${sourceMap.contractName}`
       await s3upload({
         Key: path,
         Bucket: BUCKET_NAME,
diff --git a/packages/srcmap-compiler/src/solc.ts b/packages/srcmap-compiler/src/solc.ts
index 258dcbdc..49c78e10 100644
--- a/packages/srcmap-compiler/src/solc.ts
+++ b/packages/srcmap-compiler/src/solc.ts
@@ -1,4 +1,4 @@
-import * as solc from 'solcv0.8.9'
+import * as solc from 'solcv0.8.22'
 
-export const solcVersion = 'v0.8.9'
+export const solcVersion = 'v0.8.22'
 export default solc
diff --git a/packages/srcmap-compiler/types/solc.d.ts b/packages/srcmap-compiler/types/solc.d.ts
index 3fdcdf4f..90ba118b 100644
--- a/packages/srcmap-compiler/types/solc.d.ts
+++ b/packages/srcmap-compiler/types/solc.d.ts
@@ -1,3 +1,3 @@
-declare module 'solcv0.8.9' {
+declare module 'solcv0.8.22' {
   export function compile(input: string): string
 }