diff --git a/awx/provider.go b/awx/provider.go
index af1b7ef0..254c506e 100644
--- a/awx/provider.go
+++ b/awx/provider.go
@@ -67,6 +67,7 @@ func Provider() *schema.Provider {
 			"awx_notification_template":                               resourceNotificationTemplate(),
 			"awx_organization":                                        resourceOrganization(),
 			"awx_organization_galaxy_credential":                      resourceOrganizationsGalaxyCredentials(),
+			"awx_organization_instance_groups":                        resourceOrganizationsInstanceGroups(),
 			"awx_project":                                             resourceProject(),
 			"awx_schedule":                                            resourceSchedule(),
 			"awx_settings_ldap_team_map":                              resourceSettingsLDAPTeamMap(),
diff --git a/awx/resource_organization_instance_groups.go b/awx/resource_organization_instance_groups.go
new file mode 100644
index 00000000..21aa14fb
--- /dev/null
+++ b/awx/resource_organization_instance_groups.go
@@ -0,0 +1,95 @@
+/*
+*TBD*
+
+# Example Usage
+
+```hcl
+
+	resource "awx_organization_instance_groups" "baseconfig" {
+	  organization_id = awx_organization.baseconfig.id
+	  credential_id   = awx_credential_machine.pi_connection.id
+	}
+
+```
+*/
+package awx
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	awx "stash.ovh.net/corobmet/goawx/client"
+)
+
+func resourceOrganizationsInstanceGroups() *schema.Resource {
+	return &schema.Resource{
+		CreateContext: resourceOrganizationsInstanceGroupsCreate,
+		DeleteContext: resourceOrganizationsInstanceGroupsDelete,
+		ReadContext:   resourceOrganizationsInstanceGroupsRead,
+
+		Schema: map[string]*schema.Schema{
+
+			"organization_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				ForceNew: true,
+			},
+			"instance_groups_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				ForceNew: true,
+			},
+		},
+	}
+}
+
+func resourceOrganizationsInstanceGroupsCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	client := m.(*awx.AWX)
+	awxService := client.OrganizationsService
+	OrganizationID := d.Get("organization_id").(int)
+	_, err := awxService.GetOrganizationsByID(OrganizationID, make(map[string]string))
+	if err != nil {
+		return buildDiagNotFoundFail("organization", OrganizationID, err)
+	}
+
+	result, err := awxService.AssociateInstanceGroups(OrganizationID, map[string]interface{}{
+		"id": d.Get("instance_groups_id").(int),
+	}, map[string]string{})
+
+	if err != nil {
+		return buildDiagnosticsMessage("Create: Organization not AssociateInstanceGroups", "Fail to add Instance Groups with Id %v, for Organization ID %v, got error: %s", d.Get("instance_groups_id").(int), OrganizationID, err.Error())
+	}
+
+	d.SetId(strconv.Itoa(result.ID))
+	return diags
+}
+
+func resourceOrganizationsInstanceGroupsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	return diags
+}
+
+func resourceOrganizationsInstanceGroupsDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	client := m.(*awx.AWX)
+	awxService := client.OrganizationsService
+	OrganizationID := d.Get("organization_id").(int)
+	res, err := awxService.GetOrganizationsByID(OrganizationID, make(map[string]string))
+	if err != nil {
+		return buildDiagNotFoundFail("organization", OrganizationID, err)
+	}
+
+	_, err = awxService.DisAssociateInstanceGroups(res.ID, map[string]interface{}{
+		"id": d.Get("instance_groups_id").(int),
+	}, map[string]string{})
+	if err != nil {
+		return buildDiagDeleteFail("Organization DisAssociateInstanceGroups", fmt.Sprintf("DisAssociateInstanceGroups %v, from OrganizationID %v got %s ", d.Get("instance_groups_id").(int), d.Get("organization_id").(int), err.Error()))
+	}
+
+	d.SetId("")
+	return diags
+}