diff --git a/resources/views/evento/criarEvento.blade.php b/resources/views/evento/criarEvento.blade.php
index 744e8fda86f3b490ef3a4decc88ad1bf6f69a3d1..b2fa802d15b75c3a4097658f914d76c3ddf400f5 100755
--- a/resources/views/evento/criarEvento.blade.php
+++ b/resources/views/evento/criarEvento.blade.php
@@ -62,7 +62,7 @@
                     <div class="col-sm-2">
                         <label for="quantidade_ods" class="col-form-label">{{ __('Quantidade de ODS\'s:') }}<span style="color:red; font-weight:bold;">*</span></label>
                         <select id="quantidade_ods" class="form-control" name="quantidade_ods" required>
-                            @for ($i = 1; $i <= 5; $i++)
+                            @for ($i = 1; $i <= 17; $i++)
                                 <option value="{{ $i }}" @if(old('quantidade_ods') == $i) selected @endif>{{ $i }}</option>
                             @endfor
                         </select>
diff --git a/resources/views/evento/submeterTrabalho.blade.php b/resources/views/evento/submeterTrabalho.blade.php
index 87c455abc088cfd565b5ee51f737f4f108380295..b3f2602c0a94ec7ca6f434dc137edabc2a84a281 100755
--- a/resources/views/evento/submeterTrabalho.blade.php
+++ b/resources/views/evento/submeterTrabalho.blade.php
@@ -814,56 +814,78 @@
       }, 5000);
     }
     // Form dinâmico da ODS
-    $(document).ready(function(){
+  $(document).ready(function () {
       var selectedOds = [];
-      $('.form-check-input').change(function(){
-          selectedOds = [];
-          $('#metas-container').empty();
-          $('.form-check-input:checked').each(function(){
-              selectedOds.push($(this).val());
-          });
-
-          if(selectedOds.length > quantidadeOds){
-            showAlert('#notificacao-erro',`Você atingiu o limite maximo de ODS\'s selecionadas(${quantidadeOds})`)
-            $(this).prop('checked', false);
-            selectedOds.pop()
-          }
-
-          selectedOds.forEach(function(odsId){
-              $.ajax({
-                  url: '/metas/' + odsId,
-                  method: 'GET',
-                  success: function(response){
-                      var metaOptions = '<hr><div class="col-12"><div class="row subtitulo"><div class="col-sm-12"><p>Metas para ' + response.ods + '</p></div></div></div></div>' + '<div class="form-group">';
-                      response.metas.forEach(function(meta){
-                          metaOptions += '<div class=" card form-check meta-item" style="margin-bottom : 1 rem "><div class="card-body">' +
-                                              '<input type="checkbox" name="metas[' + odsId + '][]" value="' + meta.id + '" class="form-check-input meta-checkbox" id="meta' +     meta.id + '">' +
-                                              '<label class="form-check-label" for="meta' + meta.id + '">' + meta.nome + '</label>' +
-                                              '<p class="form-text text-muted">' + meta.descricao + '</p>' +
-                                          '</div></div>';
-                      });
-                      metaOptions += '</div>'
-                      $('#metas-container').append(metaOptions);
-                  },
-                  error: function(jqXHR, textStatus, errorThrown){
-                      console.error('Erro ao carregar as metas:', textStatus, errorThrown);
-                      alert('Erro ao carregar as metas.');
-                  }
-                });
-            });
 
+      $('.form-check-input').change(function () {
+        selectedOds = [];
+        $('#metas-container').empty();
+        $('.form-check-input:checked').each(function () {
+          selectedOds.push($(this).val());
         });
-                
-        $(document).on('change', '.meta-checkbox', function() {
-        totalSelectedMetas = $('.meta-checkbox:checked').length;
-
-        if (totalSelectedMetas > 5) {
-          showAlert('#notificacao-erro','Você atingiu o limite maximo de metas selecionadas(5)')
-            $(this).prop('checked', false);
-            return;
+
+        if (selectedOds.length > quantidadeOds) {
+          showAlert('#notificacao-erro', `Você atingiu o limite máximo de ODS's selecionadas (${quantidadeOds})`);
+          $(this).prop('checked', false);
+          selectedOds.pop();
         }
+
+      selectedOds.forEach(function (odsId) {
+        $.ajax({
+          url: '/metas/' + odsId,
+          method: 'GET',
+          success: function (response) {
+            var metaOptions =
+              '<hr><div class="col-12"><div class="row subtitulo"><div class="col-sm-12"><p>Metas para ' +
+              response.ods +
+              '</p></div></div></div>' +
+              '<div class="form-group" data-ods-id="' + odsId + '">';
+            response.metas.forEach(function (meta) {
+              metaOptions +=
+                '<div class=" card form-check meta-item" style="margin-bottom : 1rem;"><div class="card-body">' +
+                '<input type="checkbox" name="metas[' +
+                odsId +
+                '][]" value="' +
+                meta.id +
+                '" class="form-check-input meta-checkbox" data-ods-id="' +
+                odsId +
+                '" id="meta' +
+                meta.id +
+                '">' +
+                '<label class="form-check-label" for="meta' +
+                meta.id +
+                '">' +
+                meta.nome +
+                '</label>' +
+                '<p class="form-text text-muted">' +
+                meta.descricao +
+                '</p>' +
+                '</div></div>';
+            });
+            metaOptions += '</div>';
+            $('#metas-container').append(metaOptions);
+          },
+          error: function (jqXHR, textStatus, errorThrown) {
+            console.error('Erro ao carregar as metas:', textStatus, errorThrown);
+            alert('Erro ao carregar as metas.');
+          },
+        });
+      });
+    });
+
+    $(document).on('change', '.meta-checkbox', function () {
+      // Get the odsId from the checkbox
+      var odsId = $(this).data('ods-id');
+      // Count the number of selected checkboxes within the same group (odsId)
+      var totalSelectedMetas = $('.meta-checkbox[data-ods-id="' + odsId + '"]:checked').length;
+
+      if (totalSelectedMetas > 3) { // Change the limit here if needed
+        showAlert('#notificacao-erro', 'Você atingiu o limite máximo de metas selecionadas (3) para este grupo');
+        $(this).prop('checked', false);
+      }
     });
 });
 
+
 </script>
 @endsection
\ No newline at end of file