diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index 13d81d20..8d31d23e 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -13,6 +13,7 @@
           :singleSelect="false"
           :reload="reload"
           v-on:selection-change="handleSelected"
+          :data-cy="!!$ay.dev ? 'attachTable' : false"
         >
         </gz-data-table>
 
diff --git a/ayanova/src/views/adm-history.vue b/ayanova/src/views/adm-history.vue
index b6dad1d0..3aad78a5 100644
--- a/ayanova/src/views/adm-history.vue
+++ b/ayanova/src/views/adm-history.vue
@@ -9,6 +9,7 @@
       :singleSelect="false"
       :reload="reload"
       v-on:selection-change="handleSelected"
+      :data-cy="!!$ay.dev ? 'historyTable' : false"
     >
     </gz-data-table>
   </div>
diff --git a/ayanova/src/views/adm-report-templates.vue b/ayanova/src/views/adm-report-templates.vue
index 66abda2e..4770bbb4 100644
--- a/ayanova/src/views/adm-report-templates.vue
+++ b/ayanova/src/views/adm-report-templates.vue
@@ -9,6 +9,7 @@
       :singleSelect="false"
       :reload="reload"
       v-on:selection-change="handleSelected"
+      :data-cy="!!$ay.dev ? 'reportTemplatesTable' : false"
     >
     </gz-data-table>
     <v-file-input
diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue
index 65ea2a9d..1b4be011 100644
--- a/ayanova/src/views/ops-backup.vue
+++ b/ayanova/src/views/ops-backup.vue
@@ -75,6 +75,7 @@
                 :sort-by="['created']"
                 :sort-desc="[true]"
                 :header-props="{ sortByText: $ay.t('Sort') }"
+                :data-cy="!!$ay.dev ? 'backupTable' : false"
               >
                 <template v-slot:[`item.actions`]="{ item }">
                   <v-btn icon :href="item.url">
diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue
index 9c10c311..082d67b5 100644
--- a/ayanova/src/views/ops-jobs.vue
+++ b/ayanova/src/views/ops-jobs.vue
@@ -15,6 +15,7 @@
         :sort-by="['created']"
         :sort-desc="[true]"
         :header-props="{ sortByText: $ay.t('Sort') }"
+        :data-cy="!!$ay.dev ? 'jobsTable' : false"
       >
         <template v-slot:[`item.actions`]="{ item }">
           <v-btn icon :href="item.url">
diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue
index b1cf747f..706ac631 100644
--- a/ayanova/src/views/ops-log.vue
+++ b/ayanova/src/views/ops-log.vue
@@ -11,6 +11,7 @@
         @input="logSelected"
         append-outer-icon="$ayiSync"
         @click:append-outer="getDataFromApi"
+        :data-cy="!!$ay.dev ? 'selectedLog' : false"
       >
       </v-select>
     </v-col>
diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue
index 26760464..da3635aa 100644
--- a/ayanova/src/views/ops-metrics.vue
+++ b/ayanova/src/views/ops-metrics.vue
@@ -10,6 +10,7 @@
         append-outer-icon="$ayiSync"
         @click:append-outer="getDataFromApi"
         @input="timePeriodChanged"
+        :data-cy="!!$ay.dev ? 'selectedTimePeriod' : false"
       ></v-select>
     </v-col>
 
diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue
index b27e9575..26c55b2b 100644
--- a/ayanova/src/views/ops-notification-settings.vue
+++ b/ayanova/src/views/ops-notification-settings.vue
@@ -54,6 +54,7 @@
                   form().serverErrors(this, 'smtpDeliveryActive')
                 "
                 @change="fieldValueChanged('smtpDeliveryActive')"
+                :data-cy="!!$ay.dev ? 'smtpDeliveryActive' : false"
               ></v-checkbox>
             </v-col>
             <v-col cols="12" sm="6" lg="4" xl="3">
diff --git a/ayanova/src/views/ops-profile.vue b/ayanova/src/views/ops-profile.vue
index 59ccafe8..4c1183f2 100644
--- a/ayanova/src/views/ops-profile.vue
+++ b/ayanova/src/views/ops-profile.vue
@@ -7,7 +7,7 @@
       </v-btn>
     </v-col>
     <v-col cols="12">
-      <v-card elevation="4">
+      <v-card elevation="4" :data-cy="!!$ay.dev ? 'profileCard' : false">
         <v-card :height="cardHeight">
           <iframe
             id="profileFrame"
diff --git a/ayanova/src/views/ops-server-state.vue b/ayanova/src/views/ops-server-state.vue
index 460087b6..84e9f528 100644
--- a/ayanova/src/views/ops-server-state.vue
+++ b/ayanova/src/views/ops-server-state.vue
@@ -13,7 +13,11 @@
               :disabled="formState.readOnly"
               @change="fieldValueChanged('serverState')"
             >
-              <v-radio :label="$ay.t('ServerStateOpen')" value="Open"></v-radio>
+              <v-radio
+                :label="$ay.t('ServerStateOpen')"
+                value="Open"
+                :data-cy="!!$ay.dev ? 'serverStateOpen' : false"
+              ></v-radio>
               <v-radio
                 :label="$ay.t('ServerStateOps')"
                 value="OpsOnly"
diff --git a/ayanova/tests/e2e/specs/smoke.js b/ayanova/tests/e2e/specs/smoke.js
index be9d1d9d..6190f5ab 100644
--- a/ayanova/tests/e2e/specs/smoke.js
+++ b/ayanova/tests/e2e/specs/smoke.js
@@ -161,43 +161,43 @@ describe("SMOKE", () => {
 
     cy.visit("/adm-report-templates");
     cy.url().should("include", "/adm-report-templates");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=reportTemplatesTable]");
 
     cy.visit("/adm-attachments");
     cy.url().should("include", "/adm-attachments");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=attachTable]");
 
     cy.visit("/adm-history");
     cy.url().should("include", "/adm-history");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=historyTable]");
 
     cy.visit("/ops-backup");
     cy.url().should("include", "/ops-backup");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=backupTable]");
 
     cy.visit("/ops-server-state");
     cy.url().should("include", "/ops-server-state");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=serverStateOpen]");
 
     cy.visit("/ops-jobs");
     cy.url().should("include", "/ops-jobs");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=jobsTable]");
 
     cy.visit("/ops-log");
     cy.url().should("include", "/ops-log");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=selectedLog]");
 
     cy.visit("/ops-metrics");
     cy.url().should("include", "/ops-metrics");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=selectedTimePeriod]");
 
     cy.visit("/ops-profile");
     cy.url().should("include", "/ops-profile");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=profileCard]");
 
     cy.visit("/ops-notification-settings");
     cy.url().should("include", "/ops-notification-settings");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=smtpDeliveryActive]");
 
     cy.visit("/about");
     cy.url().should("include", "/about");