diff --git a/backend/src/db/migrations/20240815045235_add-certificate-template.ts b/backend/src/db/migrations/20240815045235_add-certificate-template.ts
index b16c2bd14..7135c24e0 100644
--- a/backend/src/db/migrations/20240815045235_add-certificate-template.ts
+++ b/backend/src/db/migrations/20240815045235_add-certificate-template.ts
@@ -36,12 +36,6 @@ export async function up(knex: Knex): Promise<void> {
 }
 
 export async function down(knex: Knex): Promise<void> {
-  const hasCertificateTemplateTable = await knex.schema.hasTable(TableName.CertificateTemplate);
-  if (hasCertificateTemplateTable) {
-    await knex.schema.dropTable(TableName.CertificateTemplate);
-    await dropOnUpdateTrigger(knex, TableName.CertificateTemplate);
-  }
-
   const doesCertificateTableHaveTemplateId = await knex.schema.hasColumn(
     TableName.Certificate,
     "certificateTemplateId"
@@ -52,4 +46,10 @@ export async function down(knex: Knex): Promise<void> {
       t.dropColumn("certificateTemplateId");
     });
   }
+
+  const hasCertificateTemplateTable = await knex.schema.hasTable(TableName.CertificateTemplate);
+  if (hasCertificateTemplateTable) {
+    await knex.schema.dropTable(TableName.CertificateTemplate);
+    await dropOnUpdateTrigger(knex, TableName.CertificateTemplate);
+  }
 }
diff --git a/backend/src/services/certificate-authority/certificate-authority-service.ts b/backend/src/services/certificate-authority/certificate-authority-service.ts
index 345e2423d..32dbc8fd0 100644
--- a/backend/src/services/certificate-authority/certificate-authority-service.ts
+++ b/backend/src/services/certificate-authority/certificate-authority-service.ts
@@ -1218,7 +1218,7 @@ export const certificateAuthorityServiceFactory = ({
     await certificateDAL.transaction(async (tx) => {
       const cert = await certificateDAL.create(
         {
-          caId: ca.id,
+          caId: (ca as TCertificateAuthorities).id,
           caCertId: caCert.id,
           certificateTemplateId: certificateTemplate?.id,
           status: CertStatus.ACTIVE,
@@ -1474,7 +1474,7 @@ export const certificateAuthorityServiceFactory = ({
     await certificateDAL.transaction(async (tx) => {
       const cert = await certificateDAL.create(
         {
-          caId: ca.id,
+          caId: (ca as TCertificateAuthorities).id,
           caCertId: caCert.id,
           certificateTemplateId: certificateTemplate?.id,
           status: CertStatus.ACTIVE,